From b4c0a0912a7002f7ac8db61d240dc6416991bf7a Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Mon, 31 Mar 2025 10:08:47 +0800
Subject: [PATCH 1/2] update

---
 .gitignore | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8e8a685..7375370 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,5 +42,4 @@ ENV/
 *.db 
 
 # sqlite
-*.sqlite
-*.sqlite3
\ No newline at end of file
+jobs.sqlite
\ No newline at end of file

From 5ce525693a5f172195d2bdd2a4add9fb00a363e2 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Mon, 31 Mar 2025 17:14:57 +0800
Subject: [PATCH 2/2] update

---
 app/api/endpoints/merchant_order.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/endpoints/merchant_order.py b/app/api/endpoints/merchant_order.py
index 8a855b8..04ff3a8 100644
--- a/app/api/endpoints/merchant_order.py
+++ b/app/api/endpoints/merchant_order.py
@@ -331,7 +331,7 @@ async def complete_order(
         
         # 对商家进行结算
         account_manager = AccountManager(db)
-        settlement_amount = float(order.MerchantProductDB.settlement_amount) * order.MerchantOrderDB.qty
+        settlement_amount = float(order.merchant_product.settlement_amount) * order.qty
         if settlement_amount > 0:
             account_manager.change_balance(
                 user_id=order.merchant.user_id,