From 5cb71f8e88465a23fd9563f28dfd11573d9a66f8 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Fri, 7 Jul 2023 08:11:18 +0800
Subject: [PATCH] update

---
 .../jsowell/web/controller/pile/AdapayMemberController.java   | 4 ++--
 .../src/main/java/com/jsowell/common/util/ZipUtil.java        | 4 ++++
 .../java/com/jsowell/adapay/service/AdapayMemberService.java  | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java
index 1778bfca7..82fb34ed0 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java
@@ -90,10 +90,10 @@ public class AdapayMemberController extends BaseController {
             Map<String, Object> map = adapayMemberService.updateAdapayMember(dto);
             result = AjaxResult.success(map);
         }  catch (BusinessException e) {
-            logger.warn("查询汇付会员接口异常warn", e);
+            logger.warn("更新结算账户接口warn", e);
             result = AjaxResult.error(e.getMessage());
         } catch (Exception e) {
-            logger.error("查询汇付会员接口异常error", e);
+            logger.error("更新结算账户接口error", e);
             result = AjaxResult.error("查询汇付会员接口异常");
         }
         return result;
diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/ZipUtil.java b/jsowell-common/src/main/java/com/jsowell/common/util/ZipUtil.java
index caf96139a..387bdf3b1 100644
--- a/jsowell-common/src/main/java/com/jsowell/common/util/ZipUtil.java
+++ b/jsowell-common/src/main/java/com/jsowell/common/util/ZipUtil.java
@@ -1,6 +1,7 @@
 package com.jsowell.common.util;
 
 import com.google.common.collect.Lists;
+import org.apache.commons.collections4.CollectionUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -13,6 +14,9 @@ import java.util.zip.ZipOutputStream;
 
 public class ZipUtil {
     public static File createZipFileFromImages(List<String> imageUrls) {
+        if (CollectionUtils.isEmpty(imageUrls)) {
+            return null;
+        }
         File zipFile = new File("images.zip");
         try (FileOutputStream fos = new FileOutputStream(zipFile); ZipOutputStream zos = new ZipOutputStream(fos)) {
             for (int i = 0; i < imageUrls.size(); i++) {
diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java
index 57b3e16f9..bae1b394a 100644
--- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java
@@ -453,6 +453,9 @@ public class AdapayMemberService {
         log.info("更新企业账户param:{}", memberParams);
         Map<String, Object> member = AdapayCommon.requestAdapayFile(memberParams, file);
         log.info("更新企业账户result:{}", JSON.toJSONString(member));
+        if (StringUtils.equals((String) member.get("status"), "failed")) {
+            throw new BusinessException("", (String) member.get("error_msg"));
+        }
         return null;
     }
 }