From e6993927fc2072e0f5f1c63fea55f566e8740361 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 29 Jun 2023 15:06:31 +0800
Subject: [PATCH] update

---
 .../pile/AdapayMemberController.java          |  2 +-
 .../java/com/jsowell/common/util/ZipUtil.java | 48 +++++++++++++++++++
 .../adapay/service/AdapayMemberService.java   |  7 +--
 3 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 jsowell-common/src/main/java/com/jsowell/common/util/ZipUtil.java

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 977a37b02..313ff2d21 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
@@ -33,7 +33,7 @@ public class AdapayMemberController extends BaseController {
      * @return
      */
     @PostMapping("/createSettleAccount")
-    public AjaxResult createSettleAccount(CreateSettleAccountDTO dto) {
+    public AjaxResult createSettleAccount(@RequestBody CreateSettleAccountDTO dto) {
         logger.info("创建结算账户接口 param:{}", JSON.toJSONString(dto));
         AjaxResult result;
         try {
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
new file mode 100644
index 000000000..caf96139a
--- /dev/null
+++ b/jsowell-common/src/main/java/com/jsowell/common/util/ZipUtil.java
@@ -0,0 +1,48 @@
+package com.jsowell.common.util;
+
+import com.google.common.collect.Lists;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+public class ZipUtil {
+    public static File createZipFileFromImages(List<String> imageUrls) {
+        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++) {
+                String imageUrl = imageUrls.get(i);
+                URL url = new URL(imageUrl);
+                InputStream is = url.openStream();
+                ZipEntry zipEntry = new ZipEntry("image" + i + ".jpg");
+                zos.putNextEntry(zipEntry);
+
+                byte[] buffer = new byte[1024];
+                int bytesRead;
+                while ((bytesRead = is.read(buffer)) != -1) {
+                    zos.write(buffer, 0, bytesRead);
+                }
+
+                is.close();
+                zos.closeEntry();
+            }
+        } catch (IOException ignored) {
+
+        }
+        return zipFile;
+    }
+
+    public static void main(String[] args) {
+        List<String> list = Lists.newArrayList();
+        list.add("https://img.jsowellcloud.com/img/2023/06/09/tmp_063ba486f06c7fbf7b7dad64ad06672a_20230609090728A002.jpg");
+        list.add("https://img.jsowellcloud.com/img/2023/06/09/tmp_37828a90cc20d4b7fcbc6f62e1d2c729_20230609090658A001.jpg");
+
+        File zipFileFromImages = ZipUtil.createZipFileFromImages(list);
+        System.out.println(zipFileFromImages);
+    }
+}
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 25ac56753..827969617 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
@@ -19,6 +19,7 @@ import com.jsowell.common.constant.Constants;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.AdapayUtil;
 import com.jsowell.common.util.StringUtils;
+import com.jsowell.common.util.ZipUtil;
 import com.jsowell.common.util.id.IdUtils;
 import com.jsowell.pile.domain.AdapayMemberAccount;
 import com.jsowell.pile.service.IAdapayMemberAccountService;
@@ -47,9 +48,9 @@ public class AdapayMemberService {
     public void createSettleAccount(CreateSettleAccountDTO dto) throws Exception {
         String bankAcctType = dto.getBankAcctType();
         if (StringUtils.equals(bankAcctType, Constants.ONE)) {
-            createMember(dto);
-        } else if (StringUtils.equals(bankAcctType, Constants.TWO)) {
             createCorpMember(dto);
+        } else if (StringUtils.equals(bankAcctType, Constants.TWO)) {
+            createMember(dto);
         }
     }
 
@@ -323,7 +324,7 @@ public class AdapayMemberService {
         memberParams.put("bank_acct_type", dto.getBankAcctType());
         memberParams.put("card_no", dto.getCardNo());
         memberParams.put("card_name", dto.getCardName());
-        File file = dto.getAttachFile().getResource().getFile();
+        File file = ZipUtil.createZipFileFromImages(dto.getImgList());
         log.info("创建企业账户param:{}", memberParams);
         Map<String, Object> member = CorpMember.create(memberParams, file);
         log.info("创建企业账户result:{}", member);