clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

no message

This commit is contained in:
cb 2025-05-08 12:05:23 +08:00
parent d40822487f
commit ed034cb2c7
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -964,7 +964,7 @@ public class OrderController extends BaseController {
BeanUtils.copyProperties(orderListRequest, orderDetailReq); BeanUtils.copyProperties(orderListRequest, orderDetailReq);
List<OrderDetail> list = orderDetailService.selectOrderDetailList(orderDetailReq); List<OrderDetail> list = orderDetailService.selectOrderDetailList(orderDetailReq);
count += list.size(); count += list.size();
logger.info("子单超时数量{}",count); logger.info("子单超时数量{}子单数据{}",count,list);
List<OrderMaster> allList = new ArrayList<>(); List<OrderMaster> allList = new ArrayList<>();
List<Long> masterIdSet = new ArrayList<Long>(); List<Long> masterIdSet = new ArrayList<Long>();
if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) { if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
@ -974,7 +974,12 @@ public class OrderController extends BaseController {
List<OrderMaster> allOrderMaster = orderMasterService.selectOrderMasterList(param); List<OrderMaster> allOrderMaster = orderMasterService.selectOrderMasterList(param);
if (CollectionUtils.isNotEmpty(allOrderMaster)) { if (CollectionUtils.isNotEmpty(allOrderMaster)) {
OrderDetail countParam = new OrderDetail(); OrderDetail countParam = new OrderDetail();
countParam.setMasterIds(allOrderMaster.stream().map(OrderMaster::getId).collect(Collectors.toList())); countParam.setMasterIds(
allOrderMaster.stream()
.filter(order -> order.getOrderStatus() != 6) // 先过滤状态不等于6的订单
.map(OrderMaster::getId) // 再提取id
.collect(Collectors.toList())
);
List<OrderDetail> orderDetails = orderDetailService.selectOrderDetailList(countParam); List<OrderDetail> orderDetails = orderDetailService.selectOrderDetailList(countParam);
List<OrderDetail> result = orderDetails.stream().filter(s -> s.getTimeout().equals(1)).collect(Collectors.toList()); List<OrderDetail> result = orderDetails.stream().filter(s -> s.getTimeout().equals(1)).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(result)) { if (CollectionUtils.isNotEmpty(result)) {
@ -987,7 +992,7 @@ public class OrderController extends BaseController {
allList.addAll(orderMasterService.selectOrderMasterList(timeOutMaster)); allList.addAll(orderMasterService.selectOrderMasterList(timeOutMaster));
} }
} }
logger.info("子单超时返回的主单数量{}子单数据{}",allList.size(),allList);
// 查询主单 // 查询主单
OrderMaster orderMasterReq = new OrderMaster(); OrderMaster orderMasterReq = new OrderMaster();
BeanUtils.copyProperties(orderListRequest, orderMasterReq); BeanUtils.copyProperties(orderListRequest, orderMasterReq);