获取列表
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
package com.czg.controller.admin;
|
package com.czg.controller.admin;
|
||||||
|
|
||||||
import com.czg.BaseQueryParam;
|
|
||||||
import com.czg.market.dto.SmsPushEventDTO;
|
import com.czg.market.dto.SmsPushEventDTO;
|
||||||
import com.czg.market.service.SmsPushEventService;
|
import com.czg.market.service.SmsPushEventService;
|
||||||
import com.czg.resp.CzgResult;
|
import com.czg.resp.CzgResult;
|
||||||
@@ -29,8 +28,10 @@ public class SmsPushEventController {
|
|||||||
* 列表
|
* 列表
|
||||||
*/
|
*/
|
||||||
@GetMapping
|
@GetMapping
|
||||||
public CzgResult<Page<SmsPushEventDTO>> getPushEventPage(@RequestParam BaseQueryParam param, @RequestParam(required = false) Long id) {
|
public CzgResult<Page<SmsPushEventDTO>> getPushEventPage(@RequestParam(required = false, defaultValue = "1") Integer page,
|
||||||
Page<SmsPushEventDTO> data = pushEventService.getPushEventPage(param, StpKit.USER.getShopId(), id);
|
@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);
|
return CzgResult.success(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加营销推送发送任务
|
* 添加营销推送发送任务
|
||||||
|
|||||||
@@ -38,14 +38,14 @@ public class SmsPushEventServiceImpl extends ServiceImpl<SmsPushEventMapper, Sms
|
|||||||
private RabbitPublisher rabbitPublisher;
|
private RabbitPublisher rabbitPublisher;
|
||||||
|
|
||||||
@Override
|
@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 queryWrapper = new QueryWrapper();
|
||||||
queryWrapper.eq(SmsPushEvent::getShopId, shopId)
|
queryWrapper.eq(SmsPushEvent::getShopId, shopId)
|
||||||
.eq(SmsPushEvent::getId, id)
|
.eq(SmsPushEvent::getId, id)
|
||||||
.eq(SmsPushEvent::getIsDel, 0)
|
.eq(SmsPushEvent::getIsDel, 0)
|
||||||
.orderBy(SmsPushEvent::getCreateTime).desc();
|
.orderBy(SmsPushEvent::getCreateTime).desc();
|
||||||
Page<SmsPushEventDTO> page = pageAs(new Page<>(param.getPage(), param.getSize()), queryWrapper, SmsPushEventDTO.class);
|
Page<SmsPushEventDTO> page1 = pageAs(new Page<>(page, size), queryWrapper, SmsPushEventDTO.class);
|
||||||
for (SmsPushEventDTO record : page.getRecords()) {
|
for (SmsPushEventDTO record : page1.getRecords()) {
|
||||||
if (record.getUserType() != 2) {
|
if (record.getUserType() != 2) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -54,7 +54,7 @@ public class SmsPushEventServiceImpl extends ServiceImpl<SmsPushEventMapper, Sms
|
|||||||
);
|
);
|
||||||
record.setSmsPushEventUser(eventUser);
|
record.setSmsPushEventUser(eventUser);
|
||||||
}
|
}
|
||||||
return page;
|
return page1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user