From db70794994cf83816d86794d66fc476e6263d336 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 24 Nov 2023 18:07:23 +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=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LpkCardBuildRecordVo.java                 |  1 +
 .../api/lpkgiftcard/LpkGiftCardListQuery.java |  2 ++
 .../api/lpkgiftcard/LpkGiftCardListVo.java    |  1 +
 .../LpkCardBuildRecordMapper.xml              | 14 ++++++-----
 .../LpkCardBuildRecordRest.java               |  9 ++++----
 .../LpkCardBuildRecordService.java            | 19 +++++----------
 .../biz/lpkgiftcard/LpkGiftCardMapper.java    |  2 ++
 .../biz/lpkgiftcard/LpkGiftCardMapper.xml     | 20 ++++++++++++++++
 .../yyth/biz/lpkgiftcard/LpkGiftCardRest.java |  6 +++++
 .../biz/lpkgiftcard/LpkGiftCardService.java   | 23 +++++++++++++++++++
 10 files changed, 73 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java b/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java
index e485139..30a20a4 100644
--- a/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java
+++ b/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java
@@ -20,4 +20,5 @@ public class LpkCardBuildRecordVo implements Vo {
     private String countNumber; //总数
     private String startNumber; //起始号
     private String endNumber; //结束号
+    private String bagName;
 }
diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListQuery.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListQuery.java
index 9a5f442..26f4ce5 100644
--- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListQuery.java
+++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListQuery.java
@@ -13,4 +13,6 @@ public class LpkGiftCardListQuery implements Query {
     private String state;
     private String noStart; //序列号开始
     private String noEnd; //序列号结束
+    private String sid;
+    private String serialNumber;
 }
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 d196a4f..67f6670 100644
--- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java
+++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java
@@ -25,4 +25,5 @@ public class LpkGiftCardListVo implements Vo {
     private String grantDate;
     private String customerMobile;
     private String customerSid;
+    private String bagName;
 }
diff --git a/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.xml
index 709cca6..43b8f0f 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.xml
+++ b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.xml
@@ -7,12 +7,14 @@
 
     <select id="recordListPage" resultType="com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordVo">
         select
-        sid,
-        date_format(buildDate, '%Y-%m-%d') as buildDate,
-        countNumber,
-        startNumber,
-        endNumber
-        from lpk_card_build_record
+        r.sid,
+        r.date_format(buildDate, '%Y-%m-%d') as buildDate,
+        r.countNumber,
+        r.startNumber,
+        r.endNumber,
+        g.name as bagName
+        from lpk_card_build_record as r
+        left join lpk_giftbag as g on r.giftbagSid = g.sid
         <where>
             ${ew.sqlSegment}
         </where>
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 3284f9f..a0a6d91 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordRest.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordRest.java
@@ -6,6 +6,8 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordQuery;
 import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordVo;
+import com.yxt.yyth.api.lpkgiftcard.LpkGiftCardListQuery;
+import com.yxt.yyth.api.lpkgiftcard.LpkGiftCardListVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.junit.Test;
@@ -31,9 +33,6 @@ 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 628e449..08a1816 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordService.java
@@ -14,6 +14,7 @@ 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.LpkGiftCardListQuery;
 import com.yxt.yyth.api.lpkgiftcard.LpkGiftCardListVo;
 import com.yxt.yyth.biz.lpkgiftcard.LpkGiftCardService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,27 +40,19 @@ public class LpkCardBuildRecordService extends MybatisBaseService<LpkCardBuildRe
         QueryWrapper<LpkCardBuildRecord> qw = new QueryWrapper<>();
         qw.eq("1", "1");
         if (StringUtils.isNotBlank(query.getCountNumber())) {
-            qw.eq("countNumber", query.getCountNumber());
+            qw.eq("r.countNumber", query.getCountNumber());
         }
         String startDate = query.getStartDate();
         String effEndTime = query.getEndDate();
-        qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (buildDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')").
-                apply(org.apache.commons.lang3.StringUtils.isNotEmpty(effEndTime), "date_format (buildDate,'%Y-%m-%d') <= date_format('" + effEndTime + "','%Y-%m-%d')"
+        qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (r.buildDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')").
+                apply(org.apache.commons.lang3.StringUtils.isNotEmpty(effEndTime), "date_format (r.buildDate,'%Y-%m-%d') <= date_format('" + effEndTime + "','%Y-%m-%d')"
                 );
-        qw.orderByDesc("createTime");
+        qw.orderByDesc("r.createTime");
         IPage<LpkCardBuildRecord> page = PagerUtil.queryToPage(pq);
         IPage<LpkCardBuildRecordVo> pagging = baseMapper.recordListPage(page, qw);
         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 b937cf3..2829c93 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.java
@@ -47,4 +47,6 @@ public interface LpkGiftCardMapper extends BaseMapper<LpkGiftCard> {
     IPage<LpkGiftCardListVo> cardList(IPage<LpkGiftCard> page, @Param(Constants.WRAPPER) QueryWrapper<LpkGiftCard> qw);
 
     List<LpkGiftCardListVo> selAllByRecordSid(@Param("sid") String sid);
+
+    IPage<LpkGiftCardListVo> recordDetails(IPage<LpkGiftCard> page, @Param(Constants.WRAPPER) QueryWrapper<LpkGiftCard> qw);
 }
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 64eb14d..a521856 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
@@ -65,6 +65,26 @@
         FROM lpk_giftcard
         where recordSid = #{sid}
     </select>
+    <select id="recordDetails" 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>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 
 
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java
index b007134..742486f 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java
@@ -67,4 +67,10 @@ public class LpkGiftCardRest {
         return lpkGiftCardService.cardList(pq);
     }
 
+    @ApiOperation("查看记录详情列表")
+    @PostMapping("/recordDetails")
+    public ResultBean<PagerVo<LpkGiftCardListVo>> recordDetails(@RequestBody PagerQuery<LpkGiftCardListQuery> pq) {
+        return lpkGiftCardService.recordDetails(pq);
+    }
+
 }
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 966b649..182df32 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
@@ -14,6 +14,8 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecord;
+import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordQuery;
+import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordVo;
 import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoodsVo;
 import com.yxt.yyth.api.lpkgiftcard.*;
 import com.yxt.yyth.api.lpkgoods.LpkGoods;
@@ -257,4 +259,25 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
     public List<LpkGiftCardListVo> selAllByRecordSid(String sid) {
         return baseMapper.selAllByRecordSid(sid);
     }
+
+    public ResultBean<PagerVo<LpkGiftCardListVo>> recordDetails(PagerQuery<LpkGiftCardListQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        LpkGiftCardListQuery query = pq.getParams();
+        QueryWrapper<LpkGiftCard> qw = new QueryWrapper<>();
+        qw.eq("1", "1");
+        if (StringUtils.isNotBlank(query.getState())) {
+            qw.eq("state", query.getState());
+        }
+        if (StringUtils.isNotBlank(query.getSerialNumber())) {
+            qw.like("serialNumber", query.getSerialNumber());
+        }
+        if (StringUtils.isNotBlank(query.getSid())) {
+            qw.like("recordSid", query.getSid());
+        }
+        qw.orderByDesc("createTime");
+        IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
+        IPage<LpkGiftCardListVo> pagging = baseMapper.recordDetails(page, qw);
+        PagerVo<LpkGiftCardListVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
+    }
 }