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 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,