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 15:49:59 +08:00
parent 41c4dcea2e
commit 008ebcee79
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
model/report_summary.go
View File

@ -97,7 +97,7 @@ func (s *ReportSummary) CalculatePrices() {
s.ValleyPrice = decimal.NewNullDecimal(decimal.Zero) s.ValleyPrice = decimal.NewNullDecimal(decimal.Zero)
} }
s.Flat = s.Overall.Sub(s.Critical).Sub(s.Peak).Sub(s.Valley) s.Flat = s.Overall.Sub(s.Critical).Sub(s.Peak).Sub(s.Valley)
s.FlatFee = s.OverallFee.Sub(s.CriticalFee).Sub(s.PeakFee).Sub(s.ValleyFee) s.FlatFee = s.ConsumptionFee.Decimal.Sub(s.CriticalFee).Sub(s.PeakFee).Sub(s.ValleyFee)
if s.Flat.GreaterThan(decimal.Zero) { if s.Flat.GreaterThan(decimal.Zero) {
s.FlatPrice = decimal.NewNullDecimal(s.FlatFee.Div(s.Flat).RoundBank(8)) s.FlatPrice = decimal.NewNullDecimal(s.FlatFee.Div(s.Flat).RoundBank(8))
} else { } else {

1
service/report.go
View File

@ -585,6 +585,7 @@ func (_ReportService) AssembleReportPublicity(reportId string) (*model.Publicity
Valley: summary.PublicConsumptionValley, Valley: summary.PublicConsumptionValley,
ValleyPrice: summary.ValleyPrice, ValleyPrice: summary.ValleyPrice,
ValleyFee: summary.PublicConsumptionValleyFee, ValleyFee: summary.PublicConsumptionValleyFee,
Proportion: summary.PublicConsumptionProportion.Decimal,
} }
otherCollection := model.OtherShouldCollectionPart{ otherCollection := model.OtherShouldCollectionPart{
MaintenanceFee: summary.FinalDilutedOverall, MaintenanceFee: summary.FinalDilutedOverall,