From cdd23e0bffe4f7e957881fdfda2a2548401ad0a7 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Wed, 19 Feb 2025 11:45:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AE=8C=E6=88=90=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=86=E8=B4=A6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/endpoints/order.py | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py
index 7e18c03..e5425ba 100644
--- a/app/api/endpoints/order.py
+++ b/app/api/endpoints/order.py
@@ -788,19 +788,6 @@ async def complete_order(
         else:
             order.status = OrderStatus.COMPLETED  # 无需支付，直接完成
             
-            # 只有在订单完成状态时才进行分账
-            # 计算配送员分账金额
-            deliveryman_share = order.original_amount * settings.ORDER_DELIVERYMAN_SHARE_RATIO
-            
-            # 使用账户管理器处理分账
-            account_manager = AccountManager(db)
-            account_manager.change_balance(
-                user_id=order.deliveryman_user_id,
-                amount=deliveryman_share,
-                description=f"配送订单收益",
-                transaction_id=orderid
-            )
-            
         # 保存完成图片
         if complete_data.images:
             order.complete_images = ",".join(complete_data.images)
@@ -809,6 +796,18 @@ async def complete_order(
         order.completed_time = datetime.now()
         
         db.commit()
+        
+        # 计算配送员分账金额
+        deliveryman_share = order.original_amount * settings.ORDER_DELIVERYMAN_SHARE_RATIO
+            
+        # 使用账户管理器处理分账
+        account_manager = AccountManager(db)
+        account_manager.change_balance(
+            user_id=order.deliveryman_user_id,
+            amount=deliveryman_share,
+            description=f"配送订单收益",
+            transaction_id=orderid
+        )
 
         # 发送模板消息
         if order.userid: