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 16:08:19 +08:00
parent bcffad126c
commit 96cbd47cb0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -967,7 +967,7 @@ 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("子单超时数量{}",size); logger.info("子单超时数量{}",count);
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) {
@ -984,10 +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())){ if (CollectionUtils.isEmpty(countParam.getMasterIds())){
return count; return count;
} }
logger.info("符合条件的主单超时参数{},count{}",countParam,count);
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)) {
@ -1114,7 +1114,7 @@ public class OrderController extends BaseController {
// } else { // } else {
orderListResponses.addAll(masterList); orderListResponses.addAll(masterList);
// } // }
if (orderListRequest.getTimeout().equals(1)){ if (StringUtils.isNotEmpty(orderListRequest.getTimeout()+"")&&orderListRequest.getTimeout().equals(1)){
if (CollectionUtils.isNotEmpty(orderListResponses)){ if (CollectionUtils.isNotEmpty(orderListResponses)){
orderListResponses = orderListResponses.stream() orderListResponses = orderListResponses.stream()
.filter(order -> order.getOrderStatus() != 5 && order.getOrderStatus() != 6) .filter(order -> order.getOrderStatus() != 5 && order.getOrderStatus() != 6)