From 489a92875c61f0b0fa07bb7d637e06147915a5a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Sat, 13 Jun 2026 20:37:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9D=E7=BA=A6=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_report/models/penalty_month_received_report.py | 7 +++---- yuthon_report/models/penalty_year_cum_report.py | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/yuthon_report/models/penalty_month_received_report.py b/yuthon_report/models/penalty_month_received_report.py index 1739bbefe..c1e1acc13 100644 --- a/yuthon_report/models/penalty_month_received_report.py +++ b/yuthon_report/models/penalty_month_received_report.py @@ -174,7 +174,7 @@ class PenaltyMonthReceivedReport(models.Model): continue processed_keys.add(key) - # --- 构建租金信息 --- + # --- 构建租金信息（从租金应收单获取）--- rent_amount_val = 0.0 rent_collected_amt = 0.0 rent_uncollected_amt = 0.0 @@ -346,9 +346,8 @@ class PenaltyMonthReceivedReport(models.Model): rent_payout_date_str = "" if rent_receivable: - rent_amount_val = round( - (rent_receivable.original_amount or 0.0) - (rent_receivable.discount_amount or 0.0), 2 - ) + # 租金金额直接取 original_amount（原始金额） + rent_amount_val = round(rent_receivable.original_amount or 0.0, 2) rent_collected_amt = round(rent_receivable.delivered1 or 0.0, 2) rent_uncollected_amt = round(rent_receivable.submitted or 0.0, 2) rent_due_date_str = rent_receivable.due_date.strftime("%Y-%m-%d") if rent_receivable.due_date else "" diff --git a/yuthon_report/models/penalty_year_cum_report.py b/yuthon_report/models/penalty_year_cum_report.py index 1c3b26808..f8b7ecdfa 100644 --- a/yuthon_report/models/penalty_year_cum_report.py +++ b/yuthon_report/models/penalty_year_cum_report.py @@ -347,9 +347,8 @@ class PenaltyYearCumReport(models.Model): rent_payout_date_str = "" if rent_receivable: - rent_amount_val = round( - (rent_receivable.original_amount or 0.0) - (rent_receivable.discount_amount or 0.0), 2 - ) + # 租金金额直接取 original_amount（原始金额） + rent_amount_val = round(rent_receivable.original_amount or 0.0, 2) rent_collected_amt = round(rent_receivable.delivered1 or 0.0, 2) rent_uncollected_amt = round(rent_receivable.submitted or 0.0, 2) rent_due_date_str = rent_receivable.due_date.strftime("%Y-%m-%d") if rent_receivable.due_date else ""