diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/SmsPushEventController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/SmsPushEventController.java index 6c03cff8..292ac570 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/SmsPushEventController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/SmsPushEventController.java @@ -31,8 +31,9 @@ public class SmsPushEventController { @GetMapping public CzgResult> getPushEventPage(@RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "10") Integer size, + @RequestParam(required = false) Integer status, @RequestParam(required = false) Long id) { - Page data = pushEventService.getPushEventPage(page, size, StpKit.USER.getShopId(), id); + Page data = pushEventService.getPushEventPage(page, size, StpKit.USER.getShopId(), status, id); return CzgResult.success(data); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsPushEventService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsPushEventService.java index 397b555b..d5bf3a2d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsPushEventService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsPushEventService.java @@ -16,7 +16,7 @@ public interface SmsPushEventService extends IService { /** * 分页查询营销推送发送记录列表 */ - Page getPushEventPage(Integer page, Integer size, Long shopId, Long id); + Page getPushEventPage(Integer page, Integer size, Long shopId, Integer status, Long id); /** * 添加营销推送发送任务 diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsPushEventServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsPushEventServiceImpl.java index 4451f879..c15b8e8d 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsPushEventServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsPushEventServiceImpl.java @@ -56,10 +56,11 @@ public class SmsPushEventServiceImpl extends ServiceImpl getPushEventPage(Integer page, Integer size, Long shopId, Long id) { + public Page getPushEventPage(Integer page, Integer size, Long shopId, Integer status, Long id) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq(SmsPushEvent::getShopId, shopId) .eq(SmsPushEvent::getId, id) + .eq(SmsPushEvent::getStatus, status) .eq(SmsPushEvent::getIsDel, 0) .orderBy(SmsPushEvent::getCreateTime).desc(); Page page1 = pageAs(new Page<>(page, size), queryWrapper, SmsPushEventDTO.class);