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:14:43 +08:00
parent e661871090
commit fecb22b5ad
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1048,6 +1048,7 @@ public class OrderController extends BaseController {
@ResponseBody @ResponseBody
public AjaxResult appMixOrderList(@RequestBody OrderListRequest orderListRequest) { public AjaxResult appMixOrderList(@RequestBody OrderListRequest orderListRequest) {
List<OrderListResponse> orderListResponses = new ArrayList<>(); List<OrderListResponse> orderListResponses = new ArrayList<>();
logger.info("查询不同订单的传入参数{}",orderListRequest); logger.info("查询不同订单的传入参数{}",orderListRequest);
// 校验参数 // 校验参数
Assert.notNull(orderListRequest.getWorkerId(), "师傅id不能为空"); Assert.notNull(orderListRequest.getWorkerId(), "师傅id不能为空");
@ -1088,6 +1089,15 @@ 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 = orderListResponses.stream()
.filter(order ->
order.getOrderStatus() != 5 &&
order.getOrderStatus() != 6
)
.collect(Collectors.toList());
logger.info("处理已完成以及已取消的订单{}",orderListResponses);
}
// allList.addAll(masterList); // allList.addAll(masterList);
// 超时查询需要排除同个师傅的主单子单同时出现 // 超时查询需要排除同个师傅的主单子单同时出现
// if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) { // if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {