From 3baab6ce6f44f14432351050629248175b8493c8 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 16 Oct 2025 17:19:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/controller/admin/SmsShopTemplateController.java    | 7 ++++---
 .../main/java/com/czg/market/dto/SmsTemplateQueryDTO.java  | 2 ++
 .../market/service/impl/SmsShopTemplateServiceImpl.java    | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

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 ae99083dc..9c1c90af4 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
@@ -52,13 +52,14 @@ public class SmsShopTemplateController {
     @GetMapping("/smsTemplate")
     public CzgResult<List<SmsShopTemplateDTO>> getTemplateList(@RequestParam(required = false) String title,
                                                                @RequestParam(required = false) Integer status) {
-        List<SmsShopTemplateDTO> data = templateService.getTemplateList(title, StpKit.USER.getShopId(),status);
+        List<SmsShopTemplateDTO> data = templateService.getTemplateList(title, StpKit.USER.getShopId(), status);
         return CzgResult.success(data);
     }
 
     /**
      * 平台 商家申请记录
      */
+    @SaAdminCheckRole("管理员")
     @PostMapping("/smsTemplate/query")
     public CzgResult<Page<SmsShopTemplateDTO>> getTemplateList2(@RequestBody SmsTemplateQueryDTO param) {
         Page<SmsShopTemplateDTO> data = templateService.getTemplateList2(param);
@@ -84,7 +85,7 @@ public class SmsShopTemplateController {
     @SaAdminCheckRole("管理员")
     @PostMapping("/smsMoneyDetail/query")
     public CzgResult<Page<SmsShopMoneyDetailDTO>> getSmsMoneyDetail2(@RequestBody SmsMoneyDetailDto param) {
-        Page<SmsShopMoneyDetailDTO> data = smsMoneyDetailService.getSmsMoneyDetail2(StpKit.USER.getShopId(),param);
+        Page<SmsShopMoneyDetailDTO> data = smsMoneyDetailService.getSmsMoneyDetail2(StpKit.USER.getShopId(), param);
         return CzgResult.success(data);
     }
 
@@ -153,7 +154,7 @@ public class SmsShopTemplateController {
         moneyDetail.setBalance(shopMoney.getMoney());
         moneyDetail.setSendRows(0L);
         smsMoneyDetailService.save(moneyDetail);
-        shopMoneyMapper.update(shopMoney,true);
+        shopMoneyMapper.update(shopMoney, true);
         return CzgResult.success();
     }
 
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
index b08426d38..dd28d740a 100644
--- 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
@@ -11,4 +11,6 @@ import lombok.Data;
 @Data
 public class SmsTemplateQueryDTO extends TimeQueryParam {
     private Integer status;
+    private Integer shopUse;
+    private Integer shopId;
 }
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 033a243ca..d38ce2918 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
@@ -54,6 +54,8 @@ public class SmsShopTemplateServiceImpl extends ServiceImpl<SmsShopTemplateMappe
                 .le(SmsShopTemplate::getCreateTime, param.getEndTime())
                 .ge(SmsShopTemplate::getCreateTime, param.getStartTime())
                 .eq(SmsShopTemplate::getStatus, param.getStatus())
+                .eq(SmsShopTemplate::getShopUse, param.getShopUse())
+                .eq(SmsShopTemplate::getShopId, param.getShopId())
                 .orderBy(SmsShopTemplate::getShopId).asc()
                 .orderBy(SmsShopTemplate::getSort).asc();
         return pageAs(new Page<>(param.getPage(), param.getSize()), queryWrapper, SmsShopTemplateDTO.class);