From 00c03f96199b2f8a03655e93968e4ae86fb849eb Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 2 Jan 2024 10:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E7=A4=BC=E5=8D=A1=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EmpCardGiftStatisticsQuery.java | 17 +++++++++++++ .../empcardgift/EmpCardGiftStatisticsVo.java | 24 +++++++++++++++++++ .../biz/empcardgift/EmpCardGiftMapper.java | 2 ++ .../biz/empcardgift/EmpCardGiftMapper.xml | 23 ++++++++++++++++++ .../yyth/biz/empcardgift/EmpCardGiftRest.java | 10 +++++--- .../biz/empcardgift/EmpCardGiftService.java | 16 +++++++++++++ 6 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGiftStatisticsQuery.java create mode 100644 src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGiftStatisticsVo.java diff --git a/src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGiftStatisticsQuery.java b/src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGiftStatisticsQuery.java new file mode 100644 index 0000000..5ecf699 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGiftStatisticsQuery.java @@ -0,0 +1,17 @@ +package com.yxt.yyth.api.empcardgift; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/2 + **/ +@Data +public class EmpCardGiftStatisticsQuery implements Query { + private static final long serialVersionUID = -8730985789870186066L; + @ApiModelProperty("卡券序列号") + private String serialNumber; +} diff --git a/src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGiftStatisticsVo.java b/src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGiftStatisticsVo.java new file mode 100644 index 0000000..3748888 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGiftStatisticsVo.java @@ -0,0 +1,24 @@ +package com.yxt.yyth.api.empcardgift; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/2 + **/ +@Data +public class EmpCardGiftStatisticsVo { + + @ApiModelProperty("卡券序列号") + private String serialNumber; + @ApiModelProperty("提货编号") + private String code; + @ApiModelProperty("发行时间") + private String createTime; + @ApiModelProperty("卡券状态") + private String stateValue; + @ApiModelProperty("绑定时间") + private String bindDate; +} diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.java b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.java index 2bccca0..dc0d76d 100644 --- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.java +++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.java @@ -49,4 +49,6 @@ public interface EmpCardGiftMapper extends BaseMapper { List recordList(@Param("empCardSid")String empCardSid); List getEmpCardGiftByGiftbagSid(@Param("giftbagSid")String giftbagSid,@Param("state") String state); + + IPage empCardGiftStatisticsList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); } diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml index 4758efb..56fce21 100644 --- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml @@ -191,4 +191,27 @@ + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftRest.java b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftRest.java index 8d526d2..49d183e 100644 --- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftRest.java +++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftRest.java @@ -3,9 +3,7 @@ package com.yxt.yyth.biz.empcardgift; 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.empcardgift.EmpCardGiftDto; -import com.yxt.yyth.api.empcardgift.EmpCardGiftListVo; -import com.yxt.yyth.api.empcardgift.EmpCardGiftQuery; +import com.yxt.yyth.api.empcardgift.*; import com.yxt.yyth.api.lpkgiftcard.BindCardDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -71,6 +69,12 @@ public class EmpCardGiftRest { public ResultBean generateEmpCardGift(@RequestBody EmpCardGiftDto dto) { return EmpCardGiftService.generateEmpCardGift(dto); } + + @PostMapping("/empCardGiftStatisticsList") + @ApiOperation(value = "福礼卡统计") + ResultBean empCardGiftStatisticsList(@RequestBody PagerQuery query){ + return EmpCardGiftService.empCardGiftStatisticsList(query); + } // @GetMapping("/getCardByBank") // @ApiOperation(value = "生成礼包卡信息") // public JSONObject getCardByBank(@RequestParam(value = "pageNo",defaultValue = "1")Integer pageNo, diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java index 2308a08..fa9b4bb 100644 --- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java +++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java @@ -14,6 +14,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.yyth.api.empcard.EmpAppletVo; import com.yxt.yyth.api.empcard.EmpCard; +import com.yxt.yyth.api.empcard.EmpCardQuery; import com.yxt.yyth.api.empcard.EmpCardVo; import com.yxt.yyth.api.empcardgift.*; import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoodsDto; @@ -821,6 +822,21 @@ public class EmpCardGiftService extends MybatisBaseService empCardGiftStatisticsList(PagerQuery query) { + ResultBean rb = ResultBean.fireFail(); + EmpCardGiftStatisticsQuery params = query.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("1", "1"); + if(StringUtils.isNotBlank(params.getSerialNumber())){ + qw.like("a.serialNumber",params.getSerialNumber()); + } + qw.groupBy("a.sid"); + qw.orderByDesc("a.createTime"); + IPage page = PagerUtil.queryToPage(query); + IPage pagging = baseMapper.empCardGiftStatisticsList(page,qw); + return rb.success().setData(pagging); + } // // public static void main(String[] args) { // String startDate = "2023-12-16";