fix: 支付 request.user、jituan import、财务日统计汇总
This commit is contained in:
@@ -144,16 +144,11 @@ def build_caiwu_payload(request):
|
||||
|
||||
szjilu_payload = _build_szjilu_payload(request)
|
||||
|
||||
# 账户总收入/总支出:szjilu 全历史累计(非今日)
|
||||
total_income = float(szjilu_payload.get('zongliushui') or 0.00)
|
||||
total_payout = float(szjilu_payload.get('zongzhichu') or 0.00)
|
||||
# 俱乐部利润:累计总流水 − 累计总支出
|
||||
# 账户总收入/总支出:日收支统计表全历史 SUM(与「每日收支详细」按年汇总一致)
|
||||
total_income = float(income_qs.aggregate(total=Sum('total_amount'))['total'] or 0.00)
|
||||
total_payout = float(payout_qs.aggregate(total=Sum('total_amount'))['total'] or 0.00)
|
||||
platform_profit = round(total_income - total_payout, 2)
|
||||
|
||||
# 日统计表全历史合计(供核对)
|
||||
daily_sum_income = float(income_qs.aggregate(total=Sum('total_amount'))['total'] or 0.00)
|
||||
daily_sum_payout = float(payout_qs.aggregate(total=Sum('total_amount'))['total'] or 0.00)
|
||||
|
||||
daily_stats = []
|
||||
income_list = income_qs.order_by('-date')[:30]
|
||||
payout_dict = {
|
||||
@@ -195,7 +190,6 @@ def build_caiwu_payload(request):
|
||||
'total_income': round(total_income, 2),
|
||||
'total_payout': round(total_payout, 2),
|
||||
'platform_profit': platform_profit,
|
||||
'daily_stat_sum_income': round(daily_sum_income, 2),
|
||||
'daily_stat_sum_payout': round(daily_sum_payout, 2),
|
||||
'szjilu': szjilu_payload,
|
||||
'daily_stats': daily_stats,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user