From 61eed2b51d7b2963af875bd75f8170e07682f60a Mon Sep 17 00:00:00 2001
From: ljw <ljw@jszsyinfo.com>
Date: Tue, 23 Dec 2025 13:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=EF=BC=8C=E6=8A=BD=E6=88=90=E5=85=B1=E7=94=A8=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/OrderInfoService.java       | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
index 4b8a781..45cecf2 100644
--- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
@@ -968,6 +968,9 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
 
                     log.info("公司账户扣减成功，用户ID：{}，扣减金额：{}，余额：{} -> {}，结算方式：{}",
                             ctx.getCompanyUserId(), payMoney, oldBalance, newBalance, ctx.getSettlementWay());
+
+                    // 更新订单支付状态为已支付
+                    return updateOrderPaymentStatus(orderInfo, ctx, isIn);
                 }
             } else if (OrderCategory.DuanBoRu.equals(orderInfo.getOrderCategory())) {
                 // 短驳入订单，增加营收
@@ -995,39 +998,33 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
 
                 log.info("公司营收增加成功，用户ID：{}，扣减金额：{}，余额：{} -> {}",
                         ctx.getCompanyUserId(), payMoney, oldRevenue, newRevenue);
-            }
-            // 更新订单支付状态为已支付
-            OrderInfoEntity entity = new OrderInfoEntity();
-            entity.setId(orderInfo.getId());
-            entity.setPaymentStatus(PaymentStatus.YiZhiFu);
-            entity.setSettlementWay(ctx.getSettlementWay());
-            entity.setPayTime(LocalDateTime.now());
-            if (!isIn) {
-                entity.setOrderStatus(OrderStatus.YiWanCheng);
-                this.updateById(entity);
-                return true;
-            } else {
-                this.updateById(entity);
+                // 更新订单支付状态为已支付
+                return updateOrderPaymentStatus(orderInfo, ctx, isIn);
             }
         } else {
             // 如果支付金额为0，则直接改状态
             // 更新订单支付状态为已支付
-            OrderInfoEntity entity = new OrderInfoEntity();
-            entity.setId(orderInfo.getId());
-            entity.setSettlementWay(ctx.getSettlementWay());
-            entity.setPaymentStatus(PaymentStatus.YiZhiFu);
-            entity.setPayTime(LocalDateTime.now());
-            if (!isIn) {
-                entity.setOrderStatus(OrderStatus.YiWanCheng);
-                this.updateById(entity);
-                return true;
-            } else {
-                this.updateById(entity);
-            }
+            return updateOrderPaymentStatus(orderInfo, ctx, isIn);
         }
         return false;
     }
 
+    private boolean updateOrderPaymentStatus(OrderInfoEntity orderInfo, PaymentContextResult ctx, Boolean isIn) {
+        OrderInfoEntity entity = new OrderInfoEntity();
+        entity.setId(orderInfo.getId());
+        entity.setPaymentStatus(PaymentStatus.YiZhiFu);
+        entity.setSettlementWay(ctx.getSettlementWay());
+        entity.setPayTime(LocalDateTime.now());
+        if (!isIn) {
+            entity.setOrderStatus(OrderStatus.YiWanCheng);
+            this.updateById(entity);
+            return true;
+        } else {
+            this.updateById(entity);
+            return false;
+        }
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public void orderTimeOut() {
         log.info("检查超时订单");