From f88d3a1673e056279a04bf727e460ba76040e8e1 Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Thu, 13 Nov 2025 10:46:50 +0800
Subject: [PATCH] no message

---
 .../ghy/order/service/impl/OrderDetailServiceImpl.java | 10 ++++++++--
 .../main/resources/mapper/order/OrderDetailMapper.xml  |  6 +++---
 .../com/ghy/quartz/service/impl/OrderServiceImpl.java  |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
index ac107e25..b385f2f6 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
@@ -263,8 +263,8 @@ public class OrderDetailServiceImpl implements OrderDetailService {
         orderDetails.forEach(model -> {
             if (StringUtils.isNotEmpty(orderDetail.getIsCall())) {
                 OrderCallRecord param = new OrderCallRecord();
-//                param.setOrderType("02");
-                param.setOrderId(model.getId());
+                param.setOrderType("02");
+                param.setOrderId(model.getOrderMasterId());
                 List<OrderCallRecord> list = orderCallRecordService.selectOrderCallRecordList(param);
                 // 用于判断是约 还是 排的问题
                 if ("01".equals(orderDetail.getIsCall()) && CollectionUtils.isEmpty(list)) {
@@ -393,6 +393,12 @@ public class OrderDetailServiceImpl implements OrderDetailService {
         // 更新子订单状态
         orderDetailMapper.updateStatus(orderDetailId, OrderStatus.CANCEL.code());
         logger.info("Set OrderDetail[{}].orderStatus = {}", orderDetailId, OrderStatus.CANCEL.code());
+        
+        // 清除超时状态
+        OrderDetail updateOrderDetail = new OrderDetail();
+        updateOrderDetail.setId(orderDetailId);
+        updateOrderDetail.setTimeout(0);
+        orderDetailMapper.updateOrderDetail(updateOrderDetail);
         // 查询出所有的子订单  就走主订单取消流程
         List<OrderDetail> orderDetails = orderDetailMapper.selectByOrderMasterId(orderDetail.getOrderMasterId());
         // 判断是否是已付款的订单,未付款不需要退款
diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
index 2247b5b4..6f9c4c89 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
@@ -270,9 +270,9 @@
                     </otherwise>
                 </choose>
             </if>
-<!--            <if test="isCall != null">-->
-<!--                AND om.is_call = #{isCall}-->
-<!--            </if>-->
+            <if test="isCall != null">
+              AND om.is_call = #{isCall}
+           </if> 
         </where>
         order by od.create_time
         <trim suffixOverrides=",">
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 65c87f0c..74932f07 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
@@ -129,7 +129,7 @@ public class OrderServiceImpl implements OrderService {
             }
         }
         // 晚上19点后 - 早上8点前不需要执行定时器
-        if (nowT.getHour() < 8 || nowT.getHour() > 20) {
+        if (nowT.getHour() < 8 || nowT.getHour() >=20) {
             return;
         }
         List<Integer> list = new ArrayList<>();