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:51:09 +08:00
parent dbeace3191
commit 0ff2a6b703
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1119,13 +1119,14 @@ public class OrderController extends BaseController {
// } else {
orderListResponses.addAll(masterList);
// }
if (StringUtils.isNotEmpty(orderListRequest.getTimeout()+"")&&orderListRequest.getTimeout().equals(1)){
if (!orderListResponses.isEmpty()){
orderListResponses = orderListResponses.stream()
.filter(order -> order.getOrderStatus() != 5 && order.getOrderStatus() != 6)
.collect(Collectors.toList());
}
logger.info("处理已完成以及已取消的订单{}",orderListResponses);
logger.info("未处理的订单{}",orderListResponses);
if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
if (orderListResponses.size()>0){
orderListResponses = orderListResponses.stream()
.filter(order -> order.getOrderStatus() != 5 && order.getOrderStatus() != 6)
.collect(Collectors.toList());
}
logger.info("处理已完成及已取消的订单: {}", orderListResponses);
}
// 查询新订单列表根据创建时间倒叙排列，查询其他根据更新时间倒序排列
Collections.sort(orderListResponses, new Comparator<OrderListResponse>() {