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

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

@ -967,6 +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);
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) {
@ -983,6 +984,7 @@ 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;
} }
@ -1086,14 +1088,7 @@ public class OrderController extends BaseController {
// orderMasterReq.setExceptOrderMasterIds(masterIdSet); // orderMasterReq.setExceptOrderMasterIds(masterIdSet);
orderMasterReq.setGoodsName(null); orderMasterReq.setGoodsName(null);
List<OrderListResponse> masterList = this.getMasterList(orderMasterReq); List<OrderListResponse> masterList = this.getMasterList(orderMasterReq);
if (orderListRequest.getOrderStatus().equals(1)){
orderListResponses = Optional.ofNullable(orderListResponses)
.map(list -> list.stream()
.filter(order -> order.getOrderStatus() != 5 && order.getOrderStatus() != 6)
.collect(Collectors.toList()))
.orElseGet(Collections::emptyList);
logger.info("处理已完成以及已取消的订单{}",orderListResponses);
}
// allList.addAll(masterList); // allList.addAll(masterList);
// 超时查询需要排除同个师傅的主单子单同时出现 // 超时查询需要排除同个师傅的主单子单同时出现
// if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) { // if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
@ -1119,7 +1114,14 @@ public class OrderController extends BaseController {
// } else { // } else {
orderListResponses.addAll(masterList); orderListResponses.addAll(masterList);
// } // }
if (orderListRequest.getTimeout().equals(1)){
if (CollectionUtils.isNotEmpty(orderListResponses)){
orderListResponses = orderListResponses.stream()
.filter(order -> order.getOrderStatus() != 5 && order.getOrderStatus() != 6)
.collect(Collectors.toList());
}
logger.info("处理已完成以及已取消的订单{}",orderListResponses);
}
// 查询新订单列表根据创建时间倒叙排列，查询其他根据更新时间倒序排列 // 查询新订单列表根据创建时间倒叙排列，查询其他根据更新时间倒序排列
Collections.sort(orderListResponses, new Comparator<OrderListResponse>() { Collections.sort(orderListResponses, new Comparator<OrderListResponse>() {
@Override @Override