From 08c7cb32a96ee41c7135a1977fd161a46541051e Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Mon, 14 Jul 2025 17:33:50 +0800
Subject: [PATCH] no message

---
 .../java/com/ghy/web/controller/order/OrderController.java  | 1 +
 .../main/java/com/ghy/common/enums/OrderBehaviorEnum.java   | 6 +++++-
 .../java/com/ghy/quartz/service/impl/OrderServiceImpl.java  | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index 8b241844..45ee43cc 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -460,6 +460,7 @@ public class OrderController extends BaseController {
         od.setRevTime(om.getRevTime());
         od.setExpectTimeStart(om.getExpectTimeStart());
         od.setExpectTimeEnd(om.getExpectTimeEnd());
+        od.setWorkBeginTime(new Date());
         orderDetailService.insertOrderDetail(od);
         logger.info("子订单是否创建完成{}", od);
         // 批量生成订单商品
diff --git a/ghy-common/src/main/java/com/ghy/common/enums/OrderBehaviorEnum.java b/ghy-common/src/main/java/com/ghy/common/enums/OrderBehaviorEnum.java
index b2f658a5..d5731bc7 100644
--- a/ghy-common/src/main/java/com/ghy/common/enums/OrderBehaviorEnum.java
+++ b/ghy-common/src/main/java/com/ghy/common/enums/OrderBehaviorEnum.java
@@ -23,7 +23,11 @@ public enum OrderBehaviorEnum {
     /**
      * 派单
      */
-    ASSIGN_ORDER("ASSIGN_ORDER", "派单");
+    ASSIGN_ORDER("ASSIGN_ORDER", "派单"),
+    /**
+     * 拒绝验收
+     */
+    REJECT_ACCEPTANCE("REJECT_ACCEPTANCE", "拒绝验收");
 
     public final String code;
     public final String desc;
diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
index 2a3e8015..805bc227 100644
--- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
+++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
@@ -1456,7 +1456,8 @@ public class OrderServiceImpl implements OrderService {
                 // 检查是否到达目标时间
                 if (now.after(targetTime)) {
                     log.info("订单[{}]确认截止时间已到，开始转为确认中状态", orderDetail.getCode());
-                    
+                    orderDetail.setWorkFinishTime(new Date());
+                    orderDetailService.updateOrderDetail(orderDetail);
                     // 更新订单状态为确认中
                     int result = orderDetailService.updateStatus(orderDetail.getId(), OrderStatus.FINISH_CHECK.code());