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-11-07 09:28:08 +08:00
parent 34d71c1fd0
commit f1df93ec25
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -1858,6 +1858,7 @@ public class OrderMasterController extends BaseController {
}
OrderStandardDetail orderStandardDetail = new OrderStandardDetail();
orderStandardDetail.setRefundPayStatus(orderMaster.getRefundPayStatus());
orderStandardDetail.setPayStatus(orderMaster.getPayStatus());
orderStandardDetail.setAfterPlatformServiceStatus(orderDetail.getAfterServiceStatus());
orderStandardDetail.setOrderImages(orderDetail.getOrderImages());
@ -2549,7 +2550,38 @@ public class OrderMasterController extends BaseController {
// goodsOrderUpdate.setServiceShopId((long) -1);
// 设置服务主单已撤销标识
goodsOrderUpdate.setServiceCancelled(1);
// 判断商品主单是否仍旧满足监控单条件
OrderMaster goodsOrder = orderMasterService.selectById(orderMasterInfo.getGoodsOrderMasterId());
boolean shouldShowInMonitor = false;
if (goodsOrder != null) {
// 查询商品主单的所有派单详情
List<OrderDetail> orderDetails1 = orderDetailService.selectByOrderMasterId(goodsOrder.getId());
Set<Long> assignedWorkIds = orderDetails1.stream()
.map(OrderDetail::getWorkerId)
.filter(Objects::nonNull)
.collect(Collectors.toSet());
// 判断是否全部派完
if (orderMasterService.isAllAssign(goodsOrder.getId())) {
// 派完单的情况下：如果有其他师傅接单（包含其他人），则需要显示在监控单
if (assignedWorkIds.size() > 1 || !assignedWorkIds.contains(goodsOrder.getWorkerId())) {
shouldShowInMonitor = true;
}
} else {
// 未派完单的情况下：如果派给了非自己的师傅，则需要显示在监控单
if (assignedWorkIds.size() > 1 || (assignedWorkIds.size() == 1 && !assignedWorkIds.contains(goodsOrder.getWorkerId()))) {
shouldShowInMonitor = true;
}
}
}
// 只有在不满足监控单条件时才设置为0，否则保持原值
if (!shouldShowInMonitor) {
goodsOrderUpdate.setShowInMonitor(0);
}
orderMasterService.updateOrderMaster(goodsOrderUpdate);
}

2
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java
View File

@ -132,4 +132,6 @@ public class OrderStandardDetail {
private Integer afterPlatformServiceStatus;
private Integer payStatus;
private Integer refundPayStatus;
}