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:24:49 +08:00
parent fecb22b5ad
commit 6dbdb33a2b
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -967,7 +967,6 @@ public class OrderController extends BaseController {
.filter(order -> order.getOrderStatus() != 6) // 先过滤状态不等于6的订单 .filter(order -> order.getOrderStatus() != 6) // 先过滤状态不等于6的订单
.filter(order -> order.getOrderStatus() != 5).count(); .filter(order -> order.getOrderStatus() != 5).count();
count += size; count += size;
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>();
if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) { if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
@ -987,7 +986,6 @@ public class OrderController extends BaseController {
if (CollectionUtils.isEmpty(countParam.getMasterIds())){ if (CollectionUtils.isEmpty(countParam.getMasterIds())){
return count; 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)) {
@ -1000,7 +998,6 @@ 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);
@ -1090,12 +1087,11 @@ public class OrderController extends BaseController {
orderMasterReq.setGoodsName(null); orderMasterReq.setGoodsName(null);
List<OrderListResponse> masterList = this.getMasterList(orderMasterReq); List<OrderListResponse> masterList = this.getMasterList(orderMasterReq);
if (orderListRequest.getOrderStatus().equals(1)){ if (orderListRequest.getOrderStatus().equals(1)){
orderListResponses = orderListResponses.stream() orderListResponses = Optional.ofNullable(orderListResponses)
.filter(order -> .map(list -> list.stream()
order.getOrderStatus() != 5 && .filter(order -> order.getOrderStatus() != 5 && order.getOrderStatus() != 6)
order.getOrderStatus() != 6 .collect(Collectors.toList()))
) .orElseGet(Collections::emptyList);
.collect(Collectors.toList());
logger.info("处理已完成以及已取消的订单{}",orderListResponses); logger.info("处理已完成以及已取消的订单{}",orderListResponses);
} }
// allList.addAll(masterList); // allList.addAll(masterList);