From a26357e47ea26861a881786b699b2819d993cca5 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 16 Oct 2025 16:42:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=20=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E7=8A=B6=E6=80=81/=E5=88=A0=E9=99=A4=20=E5=B9=B3=E5=8F=B0=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BA=97=E9=93=BA=E7=9F=AD=E4=BF=A1=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/SmsShopTemplateController.java | 30 +++++++++++++++++-- .../com/czg/market/dto/SmsMoneyDetailDto.java | 16 ++++++++++ .../czg/market/dto/SmsShopTemplateDTO.java | 9 ++++++ .../czg/market/entity/SmsShopTemplate.java | 10 +++++++ .../service/SmsShopMoneyDetailService.java | 3 ++ .../service/SmsShopTemplateService.java | 2 ++ .../impl/SmsShopMoneyDetailServiceImpl.java | 14 +++++++++ .../impl/SmsShopTemplateServiceImpl.java | 18 ++++++++++- 8 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsMoneyDetailDto.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 0fe6195c..00db21f2 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 @@ -3,9 +3,12 @@ package com.czg.controller.admin; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson2.JSONObject; +import com.czg.TimeQueryParam; +import com.czg.annotation.SaAdminCheckLogin; +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.entity.ShopCoupon; import com.czg.market.entity.SmsShopMoney; import com.czg.market.entity.SmsShopMoneyDetail; import com.czg.market.service.SmsShopMoneyDetailService; @@ -51,6 +54,29 @@ public class SmsShopTemplateController { return CzgResult.success(data); } + /** + * 平台 模板状态/删除 + */ + @SaAdminCheckRole("管理员") + @PostMapping("/smsTemplate/shopUse") + public CzgResult shopUse(@RequestBody SmsShopTemplateDTO param) { + param.setShopId(StpKit.USER.getShopId()); + templateService.shopUse(param); + return CzgResult.success(); + } + + + /** + * 平台 获取店铺短信余额明细 + */ + @SaAdminCheckRole("管理员") + @PostMapping("/smsMoneyDetail/query") + public CzgResult> getSmsMoneyDetail2(@RequestBody SmsMoneyDetailDto param) { + Page data = smsMoneyDetailService.getSmsMoneyDetail2(StpKit.USER.getShopId(),param); + return CzgResult.success(data); + } + + /** * 新增 */ @@ -125,7 +151,7 @@ public class SmsShopTemplateController { */ @GetMapping("/smsMoneyDetail") public CzgResult getSmsMoneyDetailPage(@RequestParam(required = false) Integer page, - @RequestParam(required = false) Integer size) { + @RequestParam(required = false) Integer size) { Page data = smsMoneyDetailService.getSmsMoneyDetailPage(StpKit.USER.getShopId()); JSONObject from = JSONObject.from(data); from.put("sendTotal", smsMoneyDetailService.countSendTotal(StpKit.USER.getShopId())); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsMoneyDetailDto.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsMoneyDetailDto.java new file mode 100644 index 00000000..26f06a00 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsMoneyDetailDto.java @@ -0,0 +1,16 @@ +package com.czg.market.dto; + +import com.czg.TimeQueryParam; +import lombok.Data; + +/** + * 平台查看 商家短信余额明细 + * sms_shop_money_detail 表 + * @author ww + * @description + */ +@Data +public class SmsMoneyDetailDto extends TimeQueryParam { + // 1 充值 2 扣款 + Integer type; +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsShopTemplateDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsShopTemplateDTO.java index efdfd4ad..6f794fda 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsShopTemplateDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsShopTemplateDTO.java @@ -63,6 +63,15 @@ public class SmsShopTemplateDTO implements Serializable { * 0 待申请 1 审核中 2 成功 -1失败 -2 重新申请中 */ private Integer status; + /** + * 店铺是否使用 0 否 1 是 + */ + private Integer shopUse; + + /** + * 是否删除 0 否 1 是 + */ + private Integer isDel; /** * 失败原因 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsShopTemplate.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsShopTemplate.java index 26dd679f..d449fe2d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsShopTemplate.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsShopTemplate.java @@ -1,3 +1,4 @@ + package com.czg.market.entity; import com.mybatisflex.annotation.Column; @@ -56,6 +57,15 @@ public class SmsShopTemplate implements Serializable { */ private Integer sort; + /** + * 店铺是否使用 0 否 1 是 + */ + private Integer shopUse; + /** + * 是否删除 0 否 1 是 + */ + private Integer isDel; + /** * 0 待申请 1 审核中 2 成功 -1失败 -2 重新申请中 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsShopMoneyDetailService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsShopMoneyDetailService.java index eb35479f..c31f370b 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsShopMoneyDetailService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsShopMoneyDetailService.java @@ -1,5 +1,7 @@ package com.czg.market.service; +import com.czg.TimeQueryParam; +import com.czg.market.dto.SmsMoneyDetailDto; import com.czg.market.dto.SmsShopMoneyDetailDTO; import com.czg.market.entity.SmsShopMoneyDetail; import com.mybatisflex.core.paginate.Page; @@ -16,6 +18,7 @@ import java.math.BigDecimal; public interface SmsShopMoneyDetailService extends IService { Page getSmsMoneyDetailPage(Long shopId); + Page getSmsMoneyDetail2(Long shopId, SmsMoneyDetailDto param); /** * 统计发送短信总数 */ 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 ce0293f9..eb760454 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 @@ -23,5 +23,7 @@ public interface SmsShopTemplateService extends IService { List getTemplateList(String name, Long shopId); void addTemplate(SmsShopTemplateDTO param); + + void shopUse(SmsShopTemplateDTO param); void resubmit(SmsShopTemplateDTO param); } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopMoneyDetailServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopMoneyDetailServiceImpl.java index 2a3b4cbb..da1febc0 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopMoneyDetailServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopMoneyDetailServiceImpl.java @@ -1,5 +1,7 @@ package com.czg.service.market.service.impl; +import com.czg.TimeQueryParam; +import com.czg.market.dto.SmsMoneyDetailDto; import com.czg.market.dto.SmsShopMoneyDetailDTO; import com.czg.market.entity.SmsShopMoneyDetail; import com.czg.market.service.SmsShopMoneyDetailService; @@ -31,6 +33,18 @@ public class SmsShopMoneyDetailServiceImpl extends ServiceImpl getSmsMoneyDetail2(Long shopId, SmsMoneyDetailDto param) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq(SmsShopMoneyDetail::getShopId, shopId) + .eq(SmsShopMoneyDetail::getIsDel, 0) + .ge(SmsShopMoneyDetail::getCreateTime, param.getStartTime()) + .le(SmsShopMoneyDetail::getCreateTime, param.getEndTime()) + .eq(SmsShopMoneyDetail::getType, param.getType()) + .orderBy(SmsShopMoneyDetail::getCreateTime).desc(); + return pageAs(PageUtil.buildPage(), queryWrapper, SmsShopMoneyDetailDTO.class); + } + @Override public Long countSendTotal(Long shopId) { QueryWrapper queryWrapper = new QueryWrapper() 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 b4867360..a9a81384 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 @@ -44,8 +44,24 @@ public class SmsShopTemplateServiceImpl extends ServiceImpl