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 15:03:17 +08:00
parent 38c26e399f
commit e661871090
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -963,7 +963,10 @@ public class OrderController extends BaseController {
OrderDetail orderDetailReq = new OrderDetail(); OrderDetail orderDetailReq = new OrderDetail();
BeanUtils.copyProperties(orderListRequest, orderDetailReq); BeanUtils.copyProperties(orderListRequest, orderDetailReq);
List<OrderDetail> list = orderDetailService.selectOrderDetailList(orderDetailReq); List<OrderDetail> list = orderDetailService.selectOrderDetailList(orderDetailReq);
count += list.size(); long size= list.stream()
.filter(order -> order.getOrderStatus() != 6) // 先过滤状态不等于6的订单
.filter(order -> order.getOrderStatus() != 5).count();
count += size;
logger.info("子单超时数量{}传入的数据{}",count,orderListRequest); logger.info("子单超时数量{}传入的数据{}",count,orderListRequest);
List<OrderMaster> allList = new ArrayList<>(); List<OrderMaster> allList = new ArrayList<>();
List<Long> masterIdSet = new ArrayList<Long>(); List<Long> masterIdSet = new ArrayList<Long>();
@ -981,7 +984,10 @@ public class OrderController extends BaseController {
.map(OrderMaster::getId) // 再提取id .map(OrderMaster::getId) // 再提取id
.collect(Collectors.toList()) .collect(Collectors.toList())
); );
logger.info("符合条件主单数据{}",countParam); if (CollectionUtils.isEmpty(countParam.getMasterIds())){
return count;
}
logger.info("符合条件主单数据{},{}",countParam,CollectionUtils.isEmpty(countParam.getMasterIds()));
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)) {