提交 9fa04743 authored 作者: huningning's avatar huningning

分页问题修复

上级 31261ab9
...@@ -7,6 +7,4 @@ import java.util.List; ...@@ -7,6 +7,4 @@ import java.util.List;
@Data @Data
public class OrderChildCancelRecordParam extends PageParam { public class OrderChildCancelRecordParam extends PageParam {
private List<Integer> childStatusList;
} }
...@@ -63,7 +63,7 @@ public class OrderCancelController { ...@@ -63,7 +63,7 @@ public class OrderCancelController {
@ApiOperation(value = "取消运单记录", notes = "<br>By:胡宇帆") @ApiOperation(value = "取消运单记录", notes = "<br>By:胡宇帆")
@PostMapping("/orderChildCancelRecord") @PostMapping("/orderChildCancelRecord")
public Result<PageData<OrderChildVO>> orderChildCancelRecord(OrderChildCancelRecordParam param) { public Result<PageData<OrderChildVO>> orderChildCancelRecord(@RequestBody OrderChildCancelRecordParam param) {
IPage<OrderChildVO> page = orderCancelService.orderChildCancelRecord(param); IPage<OrderChildVO> page = orderCancelService.orderChildCancelRecord(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages()); return Result.page(page.getRecords(), page.getTotal(), page.getPages());
} }
......
...@@ -727,12 +727,6 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -727,12 +727,6 @@ 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(param.getChildStatusList(), ",")+")"); WHERE("status in (" + StringUtils.join(OrderChildEnum.CANCEL_lIST, ",")+")");
ORDER_BY("create_time desc"); ORDER_BY("create_time desc");
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论