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 379e46427..d9477eb91 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 @@ -1,6 +1,5 @@ package com.czg.controller.admin; -import com.czg.BaseQueryParam; import com.czg.market.dto.SmsPushEventDTO; import com.czg.market.service.SmsPushEventService; import com.czg.resp.CzgResult; @@ -29,8 +28,10 @@ public class SmsPushEventController { * 列表 */ @GetMapping - public CzgResult> getPushEventPage(@RequestParam BaseQueryParam param, @RequestParam(required = false) Long id) { - Page data = pushEventService.getPushEventPage(param, StpKit.USER.getShopId(), id); + public CzgResult> getPushEventPage(@RequestParam(required = false, defaultValue = "1") Integer page, + @RequestParam(required = false, defaultValue = "10") Integer size, + @RequestParam(required = false) Long id) { + Page data = pushEventService.getPushEventPage(page, size, StpKit.USER.getShopId(), 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 16f624b4c..5a41067c3 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 @@ -17,7 +17,7 @@ public interface SmsPushEventService extends IService { /** * 分页查询营销推送发送记录列表 */ - Page getPushEventPage(BaseQueryParam param, Long shopId, Long id); + Page getPushEventPage(Integer page, Integer size, Long shopId, 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 798e8683c..0a91afe4a 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 @@ -38,14 +38,14 @@ public class SmsPushEventServiceImpl extends ServiceImpl getPushEventPage(BaseQueryParam param, Long shopId, Long id) { + public Page getPushEventPage(Integer page, Integer size, Long shopId, Long id) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq(SmsPushEvent::getShopId, shopId) .eq(SmsPushEvent::getId, id) .eq(SmsPushEvent::getIsDel, 0) .orderBy(SmsPushEvent::getCreateTime).desc(); - Page page = pageAs(new Page<>(param.getPage(), param.getSize()), queryWrapper, SmsPushEventDTO.class); - for (SmsPushEventDTO record : page.getRecords()) { + Page page1 = pageAs(new Page<>(page, size), queryWrapper, SmsPushEventDTO.class); + for (SmsPushEventDTO record : page1.getRecords()) { if (record.getUserType() != 2) { continue; } @@ -54,7 +54,7 @@ public class SmsPushEventServiceImpl extends ServiceImpl