12/26

src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListQuery.java

@@ -15,4 +15,5 @@ public class LpkGiftCardListQuery implements Query {
     private String noEnd; //序列号结束
     private String sid;
     private String number;
+    private String serialNumber;
 }

src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardVo.java

@@ -35,4 +35,8 @@ public class LpkGiftCardVo implements Vo {
     private String dateStart;
     private String dateEnd;
     private String pName;
+    private String serialNumber;
+    private String stateValue;
+    private String bindDate;
+
 }

src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderQuery.java

@@ -17,4 +17,5 @@ public class LpkReserveOrderQuery implements Query {
     private String storeSid;
     private String bankSid;
     private String bankName;
+    private String serialNumber;
 }

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.java

@@ -63,6 +63,6 @@ public interface LpkGiftCardMapper extends BaseMapper<LpkGiftCard> {
     String selctMaxSerNumForExport();
 
     int saveCards(@Param("cards") List<LpkGiftCard> cards);
-    IPage<CardStatisticsExportVo> cardStatisticsList(IPage<LpkGiftCardListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<LpkGiftCardListQuery> qw);
+    IPage<LpkGiftCardVo> cardStatisticsList(IPage<LpkGiftCardListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<LpkGiftCardListQuery> qw);
     List<CardStatisticsExportVo> cardStatisticsListExport(@Param(Constants.WRAPPER) QueryWrapper<LpkGiftCardListQuery> qw);
 }

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml

@@ -152,6 +152,42 @@
         FROM lpk_giftcard as c
         WHERE c.serialNumber >= '70000001'
     </select>
+    <select id="cardStatisticsList" resultType="com.yxt.yyth.api.lpkgiftcard.LpkGiftCardVo">
+        SELECT
+            a.serialNumber as serialNumber,
+            a.CODE AS code,
+            a.createTime AS createTime,
+            a.isEnable as isEnable,
+            CASE
+                WHEN a.CODE IS NOT NULL THEN
+                    '提货卡'
+                END cardType,
+            CASE
+                a.state
+                WHEN 1 THEN
+                    '未绑卡'
+                WHEN 2 THEN
+                    '未绑卡'
+                WHEN 3 THEN
+                    '未预约'
+                WHEN 4 THEN
+                    '已预约'
+                WHEN 5 THEN
+                    '已完成'
+                END stateValue,
+            a.customerSid AS bind,
+            a.bindDate AS bindDate,
+            d.NAME AS goodsName,
+            c.goodsNumber AS goodsNumber
+        FROM
+            lpk_giftcard a
+                LEFT JOIN lpk_giftbag b ON b.sid = a.giftbagSid
+                LEFT JOIN lpk_giftbag_goods c ON c.giftbagSid = a.giftbagSid
+                LEFT JOIN lpk_goods d ON d.sid = c.goodsSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
     <select id="cardStatisticsListExport" resultType="com.yxt.yyth.api.lpkgiftcard.CardStatisticsExportVo">
         SELECT
             a.CODE AS CODE,
@@ -182,8 +218,8 @@
                 LEFT JOIN lpk_giftbag b ON b.sid = a.giftbagSid
                 LEFT JOIN lpk_giftbag_goods c ON c.giftbagSid = a.giftbagSid
                 LEFT JOIN lpk_goods d ON d.sid = c.goodsSid
-        GROUP BY
-            a.sid,
-            c.goodsSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 </mapper>

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java

@@ -138,15 +138,15 @@ public class LpkGiftCardRest {
             HttpServletResponse response) throws IOException {
         return lpkGiftCardService.getExcelInfo3(startDate,endDate,file,request,response);
     }
-    @ApiOperation("订单门店汇总列表")
+    @ApiOperation("订单门店汇总导出")
     @PostMapping("/cardStatisticsListExport")
     public void  cardStatisticsListExport(@RequestBody LpkGiftCardListQuery pq) {
         lpkGiftCardService.cardStatisticsListExport(pq);
     }
     @ApiOperation("订单门店汇总列表")
     @PostMapping("/cardStatisticsList")
-    public void  cardStatisticsList(@RequestBody PagerQuery<LpkReserveOrderQuery> pq) {
-        lpkGiftCardService.cardStatisticsList(pq);
+    public ResultBean  cardStatisticsList(@RequestBody PagerQuery<LpkReserveOrderQuery> pq) {
+        return lpkGiftCardService.cardStatisticsList(pq);
     }
 
     @ApiOperation("设置是否作废")

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java

@@ -1401,6 +1401,11 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         ResultBean rb=new ResultBean();
         QueryWrapper<LpkGiftCardListQuery> qw = new QueryWrapper<>();
         qw.eq("1", "1");
+        if(StringUtils.isNotBlank(query.getSerialNumber())){
+            qw.eq("a.serialNumber",query.getSerialNumber());
+        }
+        qw.groupBy("a.sid");
+        qw.groupBy("c.goodsSid");
         List<CardStatisticsExportVo> statisticsExportVos=baseMapper.cardStatisticsListExport(qw);
         String excelName = "支行汇总信息.xlsx";
         String fileNameURL = "1";
@@ -1435,11 +1440,20 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         ResultBean rb=new ResultBean();
         LpkReserveOrderQuery query = pq.getParams();
         QueryWrapper<LpkGiftCardListQuery> qw = new QueryWrapper<>();
-//        QueryWrapper<LpkReserveOrder> qw = new QueryWrapper<>();
         qw.eq("1", "1");
+        if(StringUtils.isNotBlank(query.getSerialNumber())){
+            qw.eq("a.serialNumber",query.getSerialNumber());
+        }
+        qw.groupBy("a.sid");
+        qw.orderByDesc("a.createTime");
+//        qw.groupBy("c.goodsSid");
         IPage<LpkGiftCardListQuery> page = PagerUtil.queryToPage(pq);
-        IPage<CardStatisticsExportVo> pagging = baseMapper.cardStatisticsList(page, qw);
-
+        IPage<LpkGiftCardVo> pagging = baseMapper.cardStatisticsList(page, qw);
+        pagging.getRecords().forEach(s->{
+            if(s.getIsEnable().equals("2")){
+                s.setStateValue("已作废");
+            }
+        });
         return rb.success().setData(pagging);
     }