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-09 11:36:51 +08:00
parent c857e551fb
commit fc38c49162
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
View File

@ -833,7 +833,10 @@ public class OrderServiceImpl implements OrderService {
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;
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) {
@ -841,9 +844,18 @@ public class OrderServiceImpl implements OrderService {
OrderMaster param = new OrderMaster(); OrderMaster param = new OrderMaster();
param.setWorkerId(orderListRequest.getWorkerId()); param.setWorkerId(orderListRequest.getWorkerId());
List<OrderMaster> allOrderMaster = orderMasterService.selectOrderMasterList(param); List<OrderMaster> allOrderMaster = orderMasterService.selectOrderMasterList(param);
if(org.apache.commons.collections.CollectionUtils.isNotEmpty(allOrderMaster)){ if (org.apache.commons.collections.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的订单
.filter(order -> order.getOrderStatus() != 5)
.map(OrderMaster::getId) // 再提取id
.collect(Collectors.toList())
);
if (org.apache.commons.collections.CollectionUtils.isEmpty(countParam.getMasterIds())){
return 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 (org.apache.commons.collections.CollectionUtils.isNotEmpty(result)) { if (org.apache.commons.collections.CollectionUtils.isNotEmpty(result)) {
@ -856,7 +868,6 @@ public class OrderServiceImpl implements OrderService {
allList.addAll(orderMasterService.selectOrderMasterList(timeOutMaster)); allList.addAll(orderMasterService.selectOrderMasterList(timeOutMaster));
} }
} }
// 查询主单 // 查询主单
OrderMaster orderMasterReq = new OrderMaster(); OrderMaster orderMasterReq = new OrderMaster();
BeanUtils.copyProperties(orderListRequest, orderMasterReq); BeanUtils.copyProperties(orderListRequest, orderMasterReq);
@ -888,12 +899,15 @@ public class OrderServiceImpl implements OrderService {
if (isKeep) { if (isKeep) {
filteredMasterList.add(master); filteredMasterList.add(master);
} }
} }
count += filteredMasterList.size(); count += filteredMasterList.size();
if (filteredMasterList.isEmpty()){
count += masterList.size();
}
} else { } else {
count += masterList.size(); count += masterList.size();
} }
return count; return count;
} }
public AjaxResult appMixAfterList(@RequestBody OrderListRequest orderListRequest) { public AjaxResult appMixAfterList(@RequestBody OrderListRequest orderListRequest) {