deliveryman/deliveryman-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into payment

Browse Source
This commit is contained in:
aaron 2025-04-01 09:36:04 +08:00
commit 12787fedfd
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -42,5 +42,4 @@ ENV/
*.db *.db
# sqlite # sqlite
*.sqlite jobs.sqlite
*.sqlite3

2
app/api/endpoints/merchant_order.py
View File

@ -331,7 +331,7 @@ async def complete_order(
# 对商家进行结算 # 对商家进行结算
account_manager = AccountManager(db) 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: if settlement_amount > 0:
account_manager.change_balance( account_manager.change_balance(
user_id=order.merchant.user_id, user_id=order.merchant.user_id,