From 41511d4f753e347f1b3c2e0353619ea625d228ac Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 16 Oct 2025 17:10:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=88=97=E8=A1=A8=201?= =?UTF-8?q?=E7=9A=84=20=E4=B8=8D=E7=AE=A1=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/SmsShopTemplateController.java | 11 +++++++++++ .../czg/market/dto/SmsTemplateQueryDTO.java | 14 ++++++++++++++ .../market/service/SmsShopTemplateService.java | 2 ++ .../impl/SmsShopTemplateServiceImpl.java | 18 +++++++++++++++++- 4 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsTemplateQueryDTO.java diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/SmsShopTemplateController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/SmsShopTemplateController.java index 1ae16ca9..ae99083d 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/SmsShopTemplateController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/SmsShopTemplateController.java @@ -9,6 +9,7 @@ import com.czg.annotation.SaAdminCheckRole; import com.czg.market.dto.SmsMoneyDetailDto; import com.czg.market.dto.SmsShopMoneyDetailDTO; import com.czg.market.dto.SmsShopTemplateDTO; +import com.czg.market.dto.SmsTemplateQueryDTO; import com.czg.market.entity.SmsShopMoney; import com.czg.market.entity.SmsShopMoneyDetail; import com.czg.market.service.SmsShopMoneyDetailService; @@ -55,6 +56,16 @@ public class SmsShopTemplateController { return CzgResult.success(data); } + /** + * 平台 商家申请记录 + */ + @PostMapping("/smsTemplate/query") + public CzgResult> getTemplateList2(@RequestBody SmsTemplateQueryDTO param) { + Page data = templateService.getTemplateList2(param); + return CzgResult.success(data); + } + + /** * 平台 模板状态/删除 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsTemplateQueryDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsTemplateQueryDTO.java new file mode 100644 index 00000000..b08426d3 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsTemplateQueryDTO.java @@ -0,0 +1,14 @@ +package com.czg.market.dto; + +import com.czg.TimeQueryParam; +import lombok.Data; + +/** + * 平台 商家申请记录查询参数 + * @author ww + * @description 平台 商家申请记录查询参数 + */ +@Data +public class SmsTemplateQueryDTO extends TimeQueryParam { + private Integer status; +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsShopTemplateService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsShopTemplateService.java index ea989e1b..f642e007 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsShopTemplateService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsShopTemplateService.java @@ -2,6 +2,7 @@ package com.czg.market.service; import com.czg.market.dto.ShopCouponDTO; import com.czg.market.dto.SmsShopTemplateDTO; +import com.czg.market.dto.SmsTemplateQueryDTO; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import com.czg.market.entity.SmsShopTemplate; @@ -21,6 +22,7 @@ public interface SmsShopTemplateService extends IService { * @return 店铺短信模板列表 */ List getTemplateList(String name, Long shopId, Integer status); + Page getTemplateList2(SmsTemplateQueryDTO param); void addTemplate(SmsShopTemplateDTO param); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopTemplateServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopTemplateServiceImpl.java index 20a7e43c..033a243c 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopTemplateServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopTemplateServiceImpl.java @@ -3,7 +3,9 @@ package com.czg.service.market.service.impl; import cn.hutool.core.bean.BeanUtil; import com.czg.config.RabbitPublisher; import com.czg.market.dto.SmsShopTemplateDTO; +import com.czg.market.dto.SmsTemplateQueryDTO; import com.czg.market.entity.ShopCoupon; +import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.market.entity.SmsShopTemplate; @@ -29,7 +31,9 @@ public class SmsShopTemplateServiceImpl extends ServiceImpl getTemplateList(String name, Long shopId, Integer status) { - Set list = Set.of(1L, shopId); + Set list = new HashSet<>(); + list.add(1L); + list.add(shopId); QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.like(SmsShopTemplate::getTitle, name) .in(SmsShopTemplate::getShopId, list) @@ -43,6 +47,18 @@ public class SmsShopTemplateServiceImpl extends ServiceImpl getTemplateList2(SmsTemplateQueryDTO param) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper + .le(SmsShopTemplate::getCreateTime, param.getEndTime()) + .ge(SmsShopTemplate::getCreateTime, param.getStartTime()) + .eq(SmsShopTemplate::getStatus, param.getStatus()) + .orderBy(SmsShopTemplate::getShopId).asc() + .orderBy(SmsShopTemplate::getSort).asc(); + return pageAs(new Page<>(param.getPage(), param.getSize()), queryWrapper, SmsShopTemplateDTO.class); + } + @Override public void addTemplate(SmsShopTemplateDTO param) { SmsShopTemplate template = BeanUtil.toBean(param, SmsShopTemplate.class);