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

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

@ -1006,6 +1006,7 @@ public class OrderController extends BaseController {
orderMasterReq.setExceptOrderMasterIds(masterIdSet); orderMasterReq.setExceptOrderMasterIds(masterIdSet);
List<OrderMaster> masterList = orderMasterService.selectOrderMasterList(orderMasterReq); List<OrderMaster> masterList = orderMasterService.selectOrderMasterList(orderMasterReq);
allList.addAll(masterList); allList.addAll(masterList);
logger.info("符合条件的主单数据{}",masterList);
// 超时查询需要排除同个师傅的主单子单同时出现 // 超时查询需要排除同个师傅的主单子单同时出现
if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) { if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
// 需要排除同个师傅的主单子单同时出现 // 需要排除同个师傅的主单子单同时出现
@ -1031,8 +1032,12 @@ public class OrderController extends BaseController {
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();
} }
@ -1115,7 +1120,7 @@ public class OrderController extends BaseController {
orderListResponses.addAll(masterList); orderListResponses.addAll(masterList);
// } // }
if (StringUtils.isNotEmpty(orderListRequest.getTimeout()+"")&&orderListRequest.getTimeout().equals(1)){ if (StringUtils.isNotEmpty(orderListRequest.getTimeout()+"")&&orderListRequest.getTimeout().equals(1)){
if (CollectionUtils.isNotEmpty(orderListResponses)){ if (!orderListResponses.isEmpty()){
orderListResponses = orderListResponses.stream() orderListResponses = orderListResponses.stream()
.filter(order -> order.getOrderStatus() != 5 && order.getOrderStatus() != 6) .filter(order -> order.getOrderStatus() != 5 && order.getOrderStatus() != 6)
.collect(Collectors.toList()); .collect(Collectors.toList());