From 547fcfc37b7f6a8a7df3de6f5858a7517344a534 Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Sat, 14 Jun 2025 12:46:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=20=E6=9D=A5=E8=A1=A8=E7=A4=BA=E6=8F=90?=
 =?UTF-8?q?=E7=8E=B0=E6=9C=AA=E5=88=B0=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ghy/common/enums/OrderStatus.java       | 3 ++-
 .../com/ghy/order/service/impl/OrderMasterServiceImpl.java    | 4 ++--
 .../java/com/ghy/quartz/service/impl/OrderServiceImpl.java    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java b/ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java
index 1c037297..f88f64da 100644
--- a/ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java
+++ b/ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java
@@ -23,7 +23,8 @@ public enum OrderStatus implements IEnumType {
     SERVER(3, "服务中"),
     FINISH_CHECK(4, "待确认"),
     FINISH(5, "已完成"),
-    CANCEL(6, "已取消");
+    CANCEL(6, "已取消"),
+    Pending(7,"待提现");
 
     private final Integer code;
     private final String desc;
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 3ccde864..dc8422dd 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_CHECK.code());
+       // updateStatus(orderMasterId, OrderStatus.FINISH_CHECK.code());
 
         if (BigDecimal.ZERO.compareTo(financialMaster.getPayMoney()) > -1) {
             logger.info("订单[code={}]支付金额<=0，不需要分账", orderMaster.getCode());
@@ -352,7 +352,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
             }
         }));
 //        //主订单提现成功 修改主订单状态为已完成
-//        updateStatus(orderMasterId, OrderStatus.FINISH.code());
+        updateStatus(orderMasterId, OrderStatus.Pending.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 dd7adbce..abf075b1 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
@@ -130,7 +130,7 @@ public class OrderServiceImpl implements OrderService {
             return;
         }
         List<Integer> list=new ArrayList<>();
-        list.add(OrderStatus.FINISH_CHECK.code());
+        list.add(OrderStatus.Pending.code());
         List<OrderMaster> orderMasterFinish = orderMasterService.selectByStatus(list);
         for (OrderMaster orderMaster:orderMasterFinish){
             List<OrderDetail> orderDetailList=orderDetailService.selectByOrderMasterId(orderMaster.getId());