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 34694a75e..52802921e 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 @@ -83,7 +83,7 @@ public class SmsShopTemplateController { @SaAdminCheckRole("管理员") @PostMapping("/smsMoneyDetail/query") public CzgResult> getSmsMoneyDetail2(@RequestBody SmsMoneyDetailDto param) { - Page data = smsMoneyDetailService.getSmsMoneyDetail2(StpKit.USER.getShopId(), param); + Page data = smsMoneyDetailService.getSmsMoneyDetail2(param); return CzgResult.success(data); } 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 c31f370b0..ad9dbd5b8 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 @@ -18,7 +18,7 @@ import java.math.BigDecimal; public interface SmsShopMoneyDetailService extends IService { Page getSmsMoneyDetailPage(Long shopId); - Page getSmsMoneyDetail2(Long shopId, SmsMoneyDetailDto param); + Page getSmsMoneyDetail2(SmsMoneyDetailDto 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 3cf72a61d..746579349 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 @@ -35,9 +35,9 @@ public class SmsShopMoneyDetailServiceImpl extends ServiceImpl getSmsMoneyDetail2(Long shopId, SmsMoneyDetailDto param) { + public Page getSmsMoneyDetail2(SmsMoneyDetailDto param) { QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq(SmsShopMoneyDetail::getShopId, shopId) + queryWrapper.eq(SmsShopMoneyDetail::getShopId, param.getShopId()) .eq(SmsShopMoneyDetail::getIsDel, 0) .ge(SmsShopMoneyDetail::getCreateTime, CzgStrUtils.getStrOrNull(param.getStartTime())) .le(SmsShopMoneyDetail::getCreateTime, CzgStrUtils.getStrOrNull(param.getEndTime()))