ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

fix(report):修复配电物业费部分的计算。

Browse Source
This commit is contained in:
徐涛 2022-09-03 21:39:02 +08:00
parent 008ebcee79
commit 37971f6875
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
model/report_summary.go
View File

@ -55,6 +55,7 @@ type ReportSummary struct {
MaintenanceDilutedPrice decimal.NullDecimal `xorm:"numeric(16,8)" json:"maintencanceDilutedPrice"` MaintenanceDilutedPrice decimal.NullDecimal `xorm:"numeric(16,8)" json:"maintencanceDilutedPrice"`
LossDilutedPrice decimal.NullDecimal `xorm:"numeric(16,8)" json:"lossDilutedPrice"` LossDilutedPrice decimal.NullDecimal `xorm:"numeric(16,8)" json:"lossDilutedPrice"`
PublicConsumptionDilutedPrice decimal.NullDecimal `xorm:"numeric(16,8)" json:"publicConsumptionDilutedPrice"` PublicConsumptionDilutedPrice decimal.NullDecimal `xorm:"numeric(16,8)" json:"publicConsumptionDilutedPrice"`
MaintenanceOverall decimal.NullDecimal `xorm:"numeric(16,8)" json:"maintenanceOverall"`
FinalDilutedOverall decimal.NullDecimal `xorm:"numeric(14,2)" json:"finalDilutedOverall"` FinalDilutedOverall decimal.NullDecimal `xorm:"numeric(14,2)" json:"finalDilutedOverall"`
} }

5
service/calculate.go
View File

@ -79,13 +79,13 @@ func (_CalculateService) ComprehensivelyCalculateReport(reportId string) (err er
summary.PublicConsumption.Decimal = summary.PublicConsumption.Decimal.Add(eu.Overall.Decimal) summary.PublicConsumption.Decimal = summary.PublicConsumption.Decimal.Add(eu.Overall.Decimal)
summary.PublicConsumptionCritical.Decimal = summary.PublicConsumptionCritical.Decimal.Add(eu.Critical.Decimal) summary.PublicConsumptionCritical.Decimal = summary.PublicConsumptionCritical.Decimal.Add(eu.Critical.Decimal)
summary.PublicConsumptionPeak.Decimal = summary.PublicConsumptionPeak.Decimal.Add(eu.Peak.Decimal) summary.PublicConsumptionPeak.Decimal = summary.PublicConsumptionPeak.Decimal.Add(eu.Peak.Decimal)
summary.PublicConsumptionFlat.Decimal = summary.PublicConsumptionPeak.Decimal.Add(eu.Flat.Decimal) summary.PublicConsumptionFlat.Decimal = summary.PublicConsumptionFlat.Decimal.Add(eu.Flat.Decimal)
summary.PublicConsumptionValley.Decimal = summary.PublicConsumptionValley.Decimal.Add(eu.Valley.Decimal) summary.PublicConsumptionValley.Decimal = summary.PublicConsumptionValley.Decimal.Add(eu.Valley.Decimal)
} else { } else {
summary.CustomerConsumption.Decimal = summary.CustomerConsumption.Decimal.Add(eu.Overall.Decimal) summary.CustomerConsumption.Decimal = summary.CustomerConsumption.Decimal.Add(eu.Overall.Decimal)
summary.CustomerConsumptionCritical.Decimal = summary.CustomerConsumptionCritical.Decimal.Add(eu.Critical.Decimal) summary.CustomerConsumptionCritical.Decimal = summary.CustomerConsumptionCritical.Decimal.Add(eu.Critical.Decimal)
summary.CustomerConsumptionPeak.Decimal = summary.CustomerConsumptionPeak.Decimal.Add(eu.Peak.Decimal) summary.CustomerConsumptionPeak.Decimal = summary.CustomerConsumptionPeak.Decimal.Add(eu.Peak.Decimal)
summary.CustomerConsumptionFlat.Decimal = summary.CustomerConsumptionPeak.Decimal.Add(eu.Flat.Decimal) summary.CustomerConsumptionFlat.Decimal = summary.CustomerConsumptionFlat.Decimal.Add(eu.Flat.Decimal)
summary.CustomerConsumptionValley.Decimal = summary.CustomerConsumptionValley.Decimal.Add(eu.Valley.Decimal) summary.CustomerConsumptionValley.Decimal = summary.CustomerConsumptionValley.Decimal.Add(eu.Valley.Decimal)
} }
} }
@ -162,6 +162,7 @@ func (_CalculateService) ComprehensivelyCalculateReport(reportId string) (err er
} }
// 计算摊薄总计 // 计算摊薄总计
summary.MaintenanceOverall = decimal.NewNullDecimal(maintenanceFeeTotal)
summary.FinalDilutedOverall = decimal.NewNullDecimal( summary.FinalDilutedOverall = decimal.NewNullDecimal(
summary.BasicFee. summary.BasicFee.
Add(summary.AdjustFee). Add(summary.AdjustFee).

35
service/report.go
View File

@ -570,25 +570,26 @@ func (_ReportService) AssembleReportPublicity(reportId string) (*model.Publicity
Proportion: summary.LossProportion.Decimal, Proportion: summary.LossProportion.Decimal,
} }
publicSummary := model.PublicConsumptionOverallPart{ publicSummary := model.PublicConsumptionOverallPart{
Overall: summary.PublicConsumption.Decimal, Overall: summary.PublicConsumption.Decimal,
OverallPrice: summary.OverallPrice.Decimal, OverallPrice: summary.OverallPrice.Decimal,
OverallFee: summary.PublicConsumptionFee.Decimal, ConsumptionFee: summary.PublicConsumptionFee.Decimal,
Critical: summary.PublicConsumptionCritical, OverallFee: summary.PublicConsumptionFee.Decimal,
CriticalPrice: summary.CriticalPrice, Critical: summary.PublicConsumptionCritical,
CriticalFee: summary.PublicConsumptionCriticalFee, CriticalPrice: summary.CriticalPrice,
Peak: summary.PublicConsumptionPeak, CriticalFee: summary.PublicConsumptionCriticalFee,
PeakPrice: summary.PeakPrice, Peak: summary.PublicConsumptionPeak,
PeakFee: summary.PublicConsumptionPeakFee, PeakPrice: summary.PeakPrice,
Flat: summary.PublicConsumptionFlat, PeakFee: summary.PublicConsumptionPeakFee,
FlatPrice: summary.FlatPrice, Flat: summary.PublicConsumptionFlat,
FlatFee: summary.PublicConsumptionFlatFee, FlatPrice: summary.FlatPrice,
Valley: summary.PublicConsumptionValley, FlatFee: summary.PublicConsumptionFlatFee,
ValleyPrice: summary.ValleyPrice, Valley: summary.PublicConsumptionValley,
ValleyFee: summary.PublicConsumptionValleyFee, ValleyPrice: summary.ValleyPrice,
Proportion: summary.PublicConsumptionProportion.Decimal, ValleyFee: summary.PublicConsumptionValleyFee,
Proportion: summary.PublicConsumptionProportion.Decimal,
} }
otherCollection := model.OtherShouldCollectionPart{ otherCollection := model.OtherShouldCollectionPart{
MaintenanceFee: summary.FinalDilutedOverall, MaintenanceFee: summary.MaintenanceOverall,
BasicFees: summary.BasicFee.Add(summary.AdjustFee), BasicFees: summary.BasicFee.Add(summary.AdjustFee),
} }
finalMaintenance := lossPart.ConsumptionFee.Add(publicSummary.ConsumptionFee).Add(otherCollection.MaintenanceFee.Decimal).Add(otherCollection.BasicFees) finalMaintenance := lossPart.ConsumptionFee.Add(publicSummary.ConsumptionFee).Add(otherCollection.MaintenanceFee.Decimal).Add(otherCollection.BasicFees)