From c8ca3a9af26073d1f4c103b6d707f4b83b0a3c51 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 24 Nov 2023 17:52:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E7=89=87=E4=BF=A1=E6=81=AF=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yyth/api/lpkgiftcard/LpkGiftCardListVo.java  |  1 -
 .../LpkCardBuildRecordRest.java                  |  5 +++++
 .../LpkCardBuildRecordService.java               | 16 ++++++++++++++++
 .../yyth/biz/lpkgiftcard/LpkGiftCardMapper.java  |  2 ++
 .../yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml   | 16 ++++++++++++++++
 .../yyth/biz/lpkgiftcard/LpkGiftCardService.java |  6 +++++-
 6 files changed, 44 insertions(+), 2 deletions(-)

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 52ad772..d196a4f 100644
--- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java
+++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java
@@ -25,5 +25,4 @@ public class LpkGiftCardListVo implements Vo {
     private String grantDate;
     private String customerMobile;
     private String customerSid;
-  //  private String picUrl;
 }
diff --git a/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordRest.java b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordRest.java
index 7de6019..3284f9f 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordRest.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordRest.java
@@ -31,4 +31,9 @@ public class LpkCardBuildRecordRest {
         return lpkCardBuildRecordService.recordListPage(pq);
     }
 
+    @ApiOperation("创建记录列表")
+    @GetMapping("/recordDetails/{sid}")
+    public ResultBean recordDetails(@PathVariable("sid") String sid) {
+        return lpkCardBuildRecordService.recordDetails(sid);
+    }
 }
diff --git a/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordService.java b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordService.java
index b4c2c0a..628e449 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordService.java
@@ -14,8 +14,12 @@ import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordVo;
 import com.yxt.yyth.api.lpkcustomer.LpkCustomer;
 import com.yxt.yyth.api.lpkcustomer.LpkCustomerQuery;
 import com.yxt.yyth.api.lpkcustomer.LpkCustomerVo;
+import com.yxt.yyth.api.lpkgiftcard.LpkGiftCardListVo;
+import com.yxt.yyth.biz.lpkgiftcard.LpkGiftCardService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -26,6 +30,8 @@ import java.util.List;
 @Service
 public class LpkCardBuildRecordService extends MybatisBaseService<LpkCardBuildRecordMapper, LpkCardBuildRecord> {
 
+    @Autowired
+    private LpkGiftCardService lpkGiftCardService;
 
     public ResultBean<PagerVo<LpkCardBuildRecordVo>> recordListPage(PagerQuery<LpkCardBuildRecordQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
@@ -46,4 +52,14 @@ public class LpkCardBuildRecordService extends MybatisBaseService<LpkCardBuildRe
         PagerVo<LpkCardBuildRecordVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);
     }
+
+    public ResultBean recordDetails(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<LpkGiftCardListVo> list = new ArrayList<>();
+        LpkCardBuildRecord record = fetchBySid(sid);
+        if (record != null) {
+            list = lpkGiftCardService.selAllByRecordSid(sid);
+        }
+        return rb.success().setData(list);
+    }
 }
diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.java
index f4864ab..b937cf3 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.java
@@ -45,4 +45,6 @@ public interface LpkGiftCardMapper extends BaseMapper<LpkGiftCard> {
     String selctMaxSerNum();
 
     IPage<LpkGiftCardListVo> cardList(IPage<LpkGiftCard> page, @Param(Constants.WRAPPER) QueryWrapper<LpkGiftCard> qw);
+
+    List<LpkGiftCardListVo> selAllByRecordSid(@Param("sid") String sid);
 }
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 77c7959..64eb14d 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
@@ -49,6 +49,22 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="selAllByRecordSid" resultType="com.yxt.yyth.api.lpkgiftcard.LpkGiftCardListVo">
+        SELECT sid,
+               date_format(createTime, '%Y-%m-%d') as createTime,
+               remarks,
+               giftbagSid,
+               serialNumber,
+               code,
+               codeKey,
+               `state`,
+               grantName,
+               date_format(grantDate, '%Y-%m-%d')  as grantDate,
+               customerMobile,
+               customerSid
+        FROM lpk_giftcard
+        where recordSid = #{sid}
+    </select>
 
 
 </mapper>
\ No newline at end of file
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 be763e0..966b649 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
@@ -174,7 +174,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         for (int j = 0; j < i; j++) {
             LpkGiftCard card = new LpkGiftCard();
             card.setRecordSid(record.getSid());
-            card.setState("1");
+            card.setState("2");
             card.setCreateTime(new DateTime());
             card.setGiftbagSid(dto.getBagSid());
             String uuid = UniqueIdGenerator.generateUniqueID();
@@ -253,4 +253,8 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         out.close();
         return sdf.format(new Date()) + "/" + uuid.substring(uuid.length() - 6) + ".jpg";
     }
+
+    public List<LpkGiftCardListVo> selAllByRecordSid(String sid) {
+        return baseMapper.selAllByRecordSid(sid);
+    }
 }