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-10-14 16:43:01 +08:00
parent 43e51e7557
commit 9ebbc056f3
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1231,6 +1231,7 @@ public class OrderMasterController extends BaseController {
}
// 编辑返回属性
orderListResponse.setGoodsOrderMasterId(master.getGoodsOrderMasterId());
orderListResponse.setWorkerRemark(master.getWorkerRemark());
orderListResponse.setIsNeedBill(master.getIsNeedBill());
orderListResponse.setIsMonitoredOrder(master.getIsMonitoredOrder());
@ -2463,6 +2464,7 @@ public class OrderMasterController extends BaseController {
OrderMaster goodsOrderUpdate = new OrderMaster();
goodsOrderUpdate.setId(orderMasterInfo.getGoodsOrderMasterId());
goodsOrderUpdate.setHasServiceOrder(0); // 重置为未派发状态
goodsOrderUpdate.setServiceShopId((long) -1);
orderMasterService.updateOrderMaster(goodsOrderUpdate);
}

5
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -522,7 +522,10 @@
<if test="timeout != null">timeout_ = #{timeout},</if>
<if test="insuranceId != null">insurance_id = #{insuranceId},</if>
<if test="serverGoodsId != null">server_goods_id = #{serverGoodsId},</if>
<if test="serviceShopId != null">service_shop_id = #{serviceShopId},</if>
<if test="serviceShopId != null and serviceShopId != 0">service_shop_id = #{serviceShopId},</if>
<if test="serviceShopId == -1">
service_shop_id = NULL,
</if>
<if test="goodsOrderMasterId != null">goods_order_master_id = #{goodsOrderMasterId},</if>
<if test="trackingNumber != null">tracking_number = #{trackingNumber},</if>
<if test="serverGoodsMoney != null">server_goods_money = #{serverGoodsMoney},</if>

15
ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
View File

@ -1498,6 +1498,21 @@ public class OrderServiceImpl implements OrderService {
// 检查是否到达目标时间
if (now.after(targetTime) && orderMaster.getPayStatus() == 1) {
// 检查是否存在对应的服务订单，如果存在则必须也是确认中状态
if (orderMaster.getHasServiceOrder() != null && orderMaster.getHasServiceOrder() == 1) {
OrderMaster serviceOrderMaster = orderMasterService.selectByGoodsOrderMasterId(orderMaster.getId());
if (serviceOrderMaster != null) {
if (serviceOrderMaster.getOrderStatus() != OrderStatus.FINISH_CHECK.code()) {
log.info("订单[{}]对应的服务订单[{}]尚未进入确认中状态，跳过商品订单状态更新",
orderDetail.getCode(), serviceOrderMaster.getCode());
continue;
} else {
log.info("订单[{}]对应的服务订单[{}]已进入确认中状态，可以更新商品订单状态",
orderDetail.getCode(), serviceOrderMaster.getCode());
}
}
}
log.info("订单[{}]确认截止时间已到，开始转为确认中状态", orderDetail.getCode());
Date workFinishTime = new Date();
orderDetail.setWorkFinishTime(workFinishTime);