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

fix bug

Browse Source
This commit is contained in:
aaron 2025-04-06 18:30:18 +08:00
parent 5f12f60b45
commit 02dcebd28e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/tasks/daily_tasks.py
View File

@ -244,6 +244,8 @@ async def daily_partner_settlement():
total_order_count = 0 total_order_count = 0
total_original_amount = 0 total_original_amount = 0
total_final_amount = 0 total_final_amount = 0
# 初始化沉淀金额总计
total_profit_sediment = 0
settlement_history = [] settlement_history = []
for stat in yesterday_stats: for stat in yesterday_stats:
@ -307,7 +309,7 @@ async def daily_partner_settlement():
} }
# 如果没有运营商、服务商，则需要沉淀到平台 # 如果没有运营商、服务商，则需要沉淀到平台
total_profit_sediment = 0 community_profit_sediment = 0
# 计算每个运营商的分成金额 # 计算每个运营商的分成金额
if len(partner_ids) > 0: if len(partner_ids) > 0:
@ -325,7 +327,7 @@ async def daily_partner_settlement():
account_manager = AccountManager(db) account_manager = AccountManager(db)
account_manager.change_balance(partner_id, per_partner_profit, f"【运营商】 {stat.community_name} 订单收益") account_manager.change_balance(partner_id, per_partner_profit, f"【运营商】 {stat.community_name} 订单收益")
else: else:
total_profit_sediment += partner_profit community_profit_sediment += partner_profit
# 计算服务商分成 # 计算服务商分成
@ -340,7 +342,7 @@ async def daily_partner_settlement():
account_manager = AccountManager(db) account_manager = AccountManager(db)
account_manager.change_balance(community.admin_id, admin_profit, f"【服务商】 {stat.community_name} 订单收益") account_manager.change_balance(community.admin_id, admin_profit, f"【服务商】 {stat.community_name} 订单收益")
else: else:
total_profit_sediment += admin_profit community_profit_sediment += admin_profit
# 计算配送员分成 # 计算配送员分成
print(f"配送员({delivery_profit_sharing/100}%) 分成金额: {delivery_profit}") print(f"配送员({delivery_profit_sharing/100}%) 分成金额: {delivery_profit}")
@ -354,10 +356,12 @@ async def daily_partner_settlement():
# 计算平台分成 # 计算平台分成
# 计算分成 + 沉淀金额 # 计算分成 + 沉淀金额
final_platform_profit = platform_profit + total_profit_sediment final_platform_profit = platform_profit + community_profit_sediment
print(f"平台({platform_profit_sharing/100}%) 分成: {platform_profit} + 沉淀金额: {total_profit_sediment}") print(f"平台({platform_profit_sharing/100}%) 分成: {platform_profit} + 沉淀金额: {community_profit_sediment}")
total_platform_profit += final_platform_profit total_platform_profit += final_platform_profit
# 累加到总沉淀金额
total_profit_sediment += community_profit_sediment
settle_details["platform_profit"] = { settle_details["platform_profit"] = {
"user_id": settings.PLATFORM_USER_ID, "user_id": settings.PLATFORM_USER_ID,

BIN
jobs.sqlite
View File

Binary file not shown.