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

fix(enduser):修正当调整电费也是空值时出现的空指针问题。

Browse Source
This commit is contained in:
徐涛 2022-09-22 16:16:14 +08:00
parent c306a749aa
commit 502a8bbcee
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/end_user.go
View File

@ -455,7 +455,7 @@ func (es _EndUserService) StatEndUserRecordInPeriod(requestUser, requestPark, st
elem.IsPublicMeter = archive.IsPublicMeter elem.IsPublicMeter = archive.IsPublicMeter
elem.Kind = archive.ParkDetail.SubmeterType elem.Kind = archive.ParkDetail.SubmeterType
} }
if elem.OverallFee.Valid && !elem.OverallFee.Decimal.IsZero() { if elem.OverallFee.Valid && elem.AdjustFee.Valid && !elem.OverallFee.Decimal.IsZero() {
elem.AdjustProportion = decimal.NewNullDecimal( elem.AdjustProportion = decimal.NewNullDecimal(
elem.AdjustFee.Decimal.Div(elem.OverallFee.Decimal).RoundBank(8), elem.AdjustFee.Decimal.Div(elem.OverallFee.Decimal).RoundBank(8),
) )