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 00db21f2..1ae16ca9 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 @@ -49,8 +49,9 @@ public class SmsShopTemplateController { * 列表 */ @GetMapping("/smsTemplate") - public CzgResult> getTemplateList(@RequestParam(required = false) String title) { - List data = templateService.getTemplateList(title, StpKit.USER.getShopId()); + public CzgResult> getTemplateList(@RequestParam(required = false) String title, + @RequestParam(required = false) Integer status) { + List data = templateService.getTemplateList(title, StpKit.USER.getShopId(),status); return CzgResult.success(data); } 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 eb760454..ea989e1b 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 @@ -20,7 +20,7 @@ public interface SmsShopTemplateService extends IService { * @param name 模板名称 模糊 * @return 店铺短信模板列表 */ - List getTemplateList(String name, Long shopId); + List getTemplateList(String name, Long shopId, Integer status); 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 a9a81384..fcd5fa60 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 @@ -30,13 +30,18 @@ public class SmsShopTemplateServiceImpl extends ServiceImpl getTemplateList(String name, Long shopId) { + public List getTemplateList(String name, Long shopId, Integer status) { List list = Arrays.asList(1L, shopId); QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.like(SmsShopTemplate::getTitle, name) .in(SmsShopTemplate::getShopId, list) .orderBy(SmsShopTemplate::getShopId).asc() .orderBy(SmsShopTemplate::getSort).asc(); + if (shopId != 1L) { + queryWrapper.eq(SmsShopTemplate::getStatus, status); + } else { + queryWrapper.eq(SmsShopTemplate::getStatus, 1); + } return listAs(queryWrapper, SmsShopTemplateDTO.class); }