From b16353ea22af6711ee3db70c1bf92a4470a0bd06 Mon Sep 17 00:00:00 2001
From: taiyi <shuobo1224@qq.com>
Date: Tue, 14 Jul 2026 20:04:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20changeOrderStatus=E4=B8=AD=E6=97=A0?=
 =?UTF-8?q?=E6=8F=90=E6=88=90=E8=AE=A2=E5=8D=95=E6=A0=87=E8=AE=B0=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E6=97=B6=E7=9B=B4=E6=8E=A5settled?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/services/order_service.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backend/app/services/order_service.py b/backend/app/services/order_service.py
index 79cd0f5..2d86c10 100644
--- a/backend/app/services/order_service.py
+++ b/backend/app/services/order_service.py
@@ -1618,6 +1618,9 @@ class OrderService:
                 # 如果有工厂ID，设置到订单上
                 if payload.get("factory_id") and target_status in ("pending_driver", "pending_logistics"):
                     order.factory_id = payload["factory_id"]
+                if target_status == "completed" and float(order.commission_amount or 0) <= 0:
+                    target_status = "settled"
+
                 self.order_repository.update_order_status(session, order, target_status)
                 arrears_service.sync_order_arrears(session, order)
                 audit_service.write_log(