提交 a61b5e9a authored 作者: huningning's avatar huningning

分页问题修复

上级 7b40c951
...@@ -3,6 +3,10 @@ package com.clx.performance.param.pc; ...@@ -3,6 +3,10 @@ package com.clx.performance.param.pc;
import com.msl.common.base.PageParam; import com.msl.common.base.PageParam;
import lombok.Data; import lombok.Data;
import java.util.List;
@Data @Data
public class OrderChildCancelRecordParam extends PageParam { public class OrderChildCancelRecordParam extends PageParam {
private List<Integer> childStatusList;
} }
...@@ -46,10 +46,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -46,10 +46,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.HashMap; import java.util.*;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Slf4j @Slf4j
...@@ -730,6 +727,12 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -730,6 +727,12 @@ public class OrderCancelServiceImpl implements OrderCancelService {
@Override @Override
public IPage<OrderChildVO> orderChildCancelRecord(OrderChildCancelRecordParam param) { public IPage<OrderChildVO> orderChildCancelRecord(OrderChildCancelRecordParam param) {
List<Integer> listStatus = new ArrayList<>();
listStatus.add(OrderChildEnum.Status.PLATFORM_CANCEL.getCode());
listStatus.add(OrderChildEnum.Status.OWNER_CANCEL.getCode());
listStatus.add(OrderChildEnum.Status.ARTIFICIAL_CANCEL.getCode());
param.setChildStatusList(listStatus);
IPage<OrderChildVO> page = orderChildDao.orderChildCancelRecord(param); IPage<OrderChildVO> page = orderChildDao.orderChildCancelRecord(param);
if (!page.getRecords().isEmpty()) { if (!page.getRecords().isEmpty()) {
String orderNo = page.getRecords().get(0).getOrderNo(); String orderNo = page.getRecords().get(0).getOrderNo();
......
...@@ -180,7 +180,7 @@ public class OrderChildSqlProvider { ...@@ -180,7 +180,7 @@ public class OrderChildSqlProvider {
); );
FROM("order_child "); FROM("order_child ");
WHERE("status in (" + StringUtils.join(OrderChildEnum.CANCEL_lIST, ",")+")"); WHERE("status in (" + StringUtils.join(param.getChildStatusList(), ",")+")");
ORDER_BY("create_time desc"); ORDER_BY("create_time desc");
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论