From 8c9d85aa019b6411ff5e6e2cc28f25fc589913b9 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 27 Nov 2023 13:52:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BC=E5=93=81=E5=8D=A1=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/yyth/api/lpkgiftcard/LpkGiftCard.java |  2 +-
 .../api/lpkgiftcard/LpkGiftCardListVo.java    |  1 +
 .../biz/lpkgiftcard/LpkGiftCardMapper.xml     |  1 +
 .../biz/lpkgiftcard/LpkGiftCardService.java   | 88 ++++++++++---------
 4 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java
index e263d2c..c96d07f 100644
--- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java
+++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java
@@ -33,5 +33,5 @@ public class LpkGiftCard {
     private String customerMobile;
     private String customerSid;
     private String recordSid;
-
+    private String recordId;
 }
diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java
index 67f6670..22547a9 100644
--- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java
+++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java
@@ -26,4 +26,5 @@ public class LpkGiftCardListVo implements Vo {
     private String customerMobile;
     private String customerSid;
     private String bagName;
+    private String recordId;
 }
diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
index f0e7caf..6520e79 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
@@ -75,6 +75,7 @@
     <select id="recordDetails" resultType="com.yxt.yyth.api.lpkgiftcard.LpkGiftCardListVo">
         SELECT
         sid,
+        recordId,
         date_format(createTime, '%Y-%m-%d') as createTime,
         remarks,
         giftbagSid,
diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
index 450ebe6..e4c93a5 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
@@ -177,43 +177,48 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         record.setGiftbagSid(dto.getBagSid());
         String startNum = "";
         String endNum = "";
-        for (int j = 0; j < i; j++) {
-            LpkGiftCard card = new LpkGiftCard();
-            card.setRecordSid(record.getSid());
-            card.setState("2");
-            card.setCreateTime(new DateTime());
-            card.setGiftbagSid(dto.getBagSid());
-            String uuid = UniqueIdGenerator.generateUniqueID();
-            int randomNumber = new Random().nextInt(900000) + 100000;
-            card.setCodeKey(String.valueOf(randomNumber));
-            card.setCode(uuid);
-            String maxSerNum = baseMapper.selctMaxSerNum(cardArea);
-            if (StringUtils.isBlank(maxSerNum)) {
-                card.setSerialNumber(cardArea + "000001");
-            } else {
-                String substringSer = maxSerNum.substring(cardArea.length());
-                int i1 = Integer.parseInt(substringSer);
-                int finNum = i1 + 1;
-                int length = String.valueOf(finNum).length();
-                int len = 6 - length;
-                String num = String.valueOf(finNum);
-                for (int a = 0; a < len; a++) {
-                    num = "0" + num;
+        record.setCardArea(cardArea);
+        lpkCardBuildRecordService.insert(record);
+        LpkCardBuildRecord cardBuildRecord = lpkCardBuildRecordService.fetchBySid(record.getSid());
+        if (null != cardBuildRecord) {
+            for (int j = 0; j < i; j++) {
+                LpkGiftCard card = new LpkGiftCard();
+                card.setRecordSid(record.getSid());
+                card.setState("2");
+                card.setCreateTime(new DateTime());
+                card.setGiftbagSid(dto.getBagSid());
+                String uuid = UniqueIdGenerator.generateUniqueID();
+                int randomNumber = new Random().nextInt(900000) + 100000;
+                card.setCodeKey(String.valueOf(randomNumber));
+                card.setCode(uuid);
+                String maxSerNum = baseMapper.selctMaxSerNum(cardArea);
+                if (StringUtils.isBlank(maxSerNum)) {
+                    card.setSerialNumber(cardArea + "000001");
+                } else {
+                    String substringSer = maxSerNum.substring(cardArea.length());
+                    int i1 = Integer.parseInt(substringSer);
+                    int finNum = i1 + 1;
+                    int length = String.valueOf(finNum).length();
+                    int len = 6 - length;
+                    String num = String.valueOf(finNum);
+                    for (int a = 0; a < len; a++) {
+                        num = "0" + num;
+                    }
+                    card.setSerialNumber(cardArea + num);
                 }
-                card.setSerialNumber(cardArea + num);
-            }
-            if (j == 0) {
-                startNum = card.getSerialNumber();
-            }
-            if (j == i - 1) {
-                endNum = card.getSerialNumber();
+                if (j == 0) {
+                    startNum = card.getSerialNumber();
+                }
+                if (j == i - 1) {
+                    endNum = card.getSerialNumber();
+                }
+                card.setRecordId(cardBuildRecord.getId());
+                baseMapper.insert(card);
             }
-            baseMapper.insert(card);
         }
-        record.setStartNumber(startNum);
-        record.setEndNumber(endNum);
-        record.setCardArea(cardArea);
-        lpkCardBuildRecordService.insert(record);
+        cardBuildRecord.setStartNumber(startNum);
+        cardBuildRecord.setEndNumber(endNum);
+        lpkCardBuildRecordService.updateById(cardBuildRecord);
         return rb.success();
     }
 
@@ -317,13 +322,14 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
             }
         }
         //定义导出的excel名字
-        String excelName = "提货卡信息列表";
-        String fileNameURL = "";
-        try {
-            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
+        String excelName = "1";
+        String fileNameURL = "1";
+//        try {
+//            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+//            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+//        } catch (UnsupportedEncodingException e) {
+//            e.printStackTrace();
+//        }
         //导出提货卡信息列表
         ExportExcelUtils.export(fileNameURL, exportList, LpkGiftCardExport.class, response);
         return rb.success();