From e8af40053604246af83ea2e334dc02dd30f59f4d Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Sat, 14 Jun 2025 12:39:03 +0800
Subject: [PATCH] no message

---
 .../service/impl/OrderMasterServiceImpl.java      |  6 +++---
 .../ghy/quartz/service/impl/OrderServiceImpl.java | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
index c9e07f2a..3ccde864 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
@@ -193,7 +193,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
         Assert.notNull(payment, String.format("主订单[id=%d]找不到支付记录", orderMasterId));
 
         // 修改主订单状态
-      //  updateStatus(orderMasterId, OrderStatus.FINISH.code());
+        updateStatus(orderMasterId, OrderStatus.FINISH_CHECK.code());
 
         if (BigDecimal.ZERO.compareTo(financialMaster.getPayMoney()) > -1) {
             logger.info("订单[code={}]支付金额<=0，不需要分账", orderMaster.getCode());
@@ -351,8 +351,8 @@ public class OrderMasterServiceImpl implements OrderMasterService {
                 logger.error("自动发起提现失败: orderMasterId={}, memberId={}, cashAmt={}", orderMasterId, memberId, amount, e);
             }
         }));
-        //主订单提现成功 修改主订单状态为已完成
-        updateStatus(orderMasterId, OrderStatus.FINISH.code());
+//        //主订单提现成功 修改主订单状态为已完成
+//        updateStatus(orderMasterId, OrderStatus.FINISH.code());
     }
 
     /**
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 77d154de..dd7adbce 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,6 +129,21 @@ public class OrderServiceImpl implements OrderService {
         if (nowT.getHour() < 8 || nowT.getHour() > 20) {
             return;
         }
+        List<Integer> list=new ArrayList<>();
+        list.add(OrderStatus.FINISH_CHECK.code());
+        List<OrderMaster> orderMasterFinish = orderMasterService.selectByStatus(list);
+        for (OrderMaster orderMaster:orderMasterFinish){
+            List<OrderDetail> orderDetailList=orderDetailService.selectByOrderMasterId(orderMaster.getId());
+            boolean allDrawCashStatusIs2 = orderDetailList != null
+                    && orderDetailList.stream()
+                    .allMatch(detail -> detail.getDrawCashStatus() == 2);
+            if (allDrawCashStatusIs2){
+                orderMasterService.updateStatus(orderMaster.getId(),OrderStatus.FINISH.code());
+            }
+        }
+
+
+
         // 查询待接单状态的主单
         List<OrderMaster> orderMasters = orderMasterService.selectByStatus(orderMasterTimeoutStatus);
         log.info("扫描到{}条未完成的主订单", orderMasters.size());