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

Compare commits

base: deliveryman:1bc0f64a0f917882dd327304d11d7f45b7183c57
Branches Tags
deliveryman:main
deliveryman:allinpay
...
compare: deliveryman:12787fedfd31f23c4ad7850c232d8eb3b505e8d5
Branches Tags
deliveryman:main
deliveryman:allinpay

3 Commits
1bc0f64a0f ... 12787fedfd

Author SHA1 Message Date
aaron
12787fedfd Merge branch 'main' into payment 2025-04-01 09:36:04 +08:00
aaron
5ce525693a update 2025-03-31 17:14:57 +08:00
aaron
b4c0a0912a update 2025-03-31 10:08:47 +08:00
2 changed files with 2 additions and 3 deletions
Show Stats Expand all files Collapse all files

3
.gitignore vendored
View File

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

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

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