From 13596532d459d11a491854b6a811c437bcc01870 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 26 Dec 2023 10:20:31 +0800 Subject: [PATCH] 12/26 --- .../api/lpkgiftcard/LpkGiftCardListQuery.java | 1 + .../yyth/api/lpkgiftcard/LpkGiftCardVo.java | 4 ++ .../lpkreserveorder/LpkReserveOrderQuery.java | 1 + .../biz/lpkgiftcard/LpkGiftCardMapper.java | 2 +- .../biz/lpkgiftcard/LpkGiftCardMapper.xml | 42 +++++++++++++++++-- .../yyth/biz/lpkgiftcard/LpkGiftCardRest.java | 6 +-- .../biz/lpkgiftcard/LpkGiftCardService.java | 20 +++++++-- 7 files changed, 66 insertions(+), 10 deletions(-) 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 5411cdb..e786bbe 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListQuery.java +++ b/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; } diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardVo.java index 1f8aff3..f777fed 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardVo.java +++ b/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; + } diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderQuery.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderQuery.java index 25a8853..d066d63 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderQuery.java +++ b/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; } 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 9b55f63..f5a9040 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.java @@ -63,6 +63,6 @@ public interface LpkGiftCardMapper extends BaseMapper { String selctMaxSerNumForExport(); int saveCards(@Param("cards") List cards); - IPage cardStatisticsList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage cardStatisticsList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List cardStatisticsListExport(@Param(Constants.WRAPPER) QueryWrapper 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 5333f31..6e43f56 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml @@ -152,6 +152,42 @@ FROM lpk_giftcard as c WHERE c.serialNumber >= '70000001' + \ 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 046fcef..7b680de 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java +++ b/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 pq) { - lpkGiftCardService.cardStatisticsList(pq); + public ResultBean cardStatisticsList(@RequestBody PagerQuery pq) { + return lpkGiftCardService.cardStatisticsList(pq); } @ApiOperation("设置是否作废") 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 b2e3605..69ea3ab 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java @@ -1401,6 +1401,11 @@ public class LpkGiftCardService extends MybatisBaseService 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 statisticsExportVos=baseMapper.cardStatisticsListExport(qw); String excelName = "支行汇总信息.xlsx"; String fileNameURL = "1"; @@ -1435,11 +1440,20 @@ public class LpkGiftCardService extends MybatisBaseService qw = new QueryWrapper<>(); -// QueryWrapper 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 page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.cardStatisticsList(page, qw); - + IPage pagging = baseMapper.cardStatisticsList(page, qw); + pagging.getRecords().forEach(s->{ + if(s.getIsEnable().equals("2")){ + s.setStateValue("已作废"); + } + }); return rb.success().setData(pagging); }