czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

获取列表

Browse Source
This commit is contained in:
wangw
2025-10-16 09:11:10 +08:00
parent 5a18dcf8a0
commit eb49945e0f
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cash-api/market-server/src/main/java/com/czg/controller/admin/SmsPushEventController.java
View File

@@ -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<Page<SmsPushEventDTO>> getPushEventPage(@RequestParam BaseQueryParam param, @RequestParam(required = false) Long id) {
Page<SmsPushEventDTO> data = pushEventService.getPushEventPage(param, StpKit.USER.getShopId(), id);
public CzgResult<Page<SmsPushEventDTO>> getPushEventPage(@RequestParam(required = false, defaultValue = "1") Integer page,
@RequestParam(required = false, defaultValue = "10") Integer size,
@RequestParam(required = false) Long id) {
Page<SmsPushEventDTO> data = pushEventService.getPushEventPage(page, size, StpKit.USER.getShopId(), id);
return CzgResult.success(data);
}

2
cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsPushEventService.java
View File

@@ -17,7 +17,7 @@ public interface SmsPushEventService extends IService<SmsPushEvent> {
/**
* 分页查询营销推送发送记录列表
*/
Page<SmsPushEventDTO> getPushEventPage(BaseQueryParam param, Long shopId, Long id);
Page<SmsPushEventDTO> getPushEventPage(Integer page, Integer size, Long shopId, Long id);
/**
* 添加营销推送发送任务

8
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsPushEventServiceImpl.java
View File

@@ -38,14 +38,14 @@ public class SmsPushEventServiceImpl extends ServiceImpl<SmsPushEventMapper, Sms
private RabbitPublisher rabbitPublisher;
@Override
public Page<SmsPushEventDTO> getPushEventPage(BaseQueryParam param, Long shopId, Long id) {
public Page<SmsPushEventDTO> 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<SmsPushEventDTO> page = pageAs(new Page<>(param.getPage(), param.getSize()), queryWrapper, SmsPushEventDTO.class);
for (SmsPushEventDTO record : page.getRecords()) {
Page<SmsPushEventDTO> 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<SmsPushEventMapper, Sms
);
record.setSmsPushEventUser(eventUser);
}
return page;
return page1;
}
@Override