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

fix(#10):修复空指针

Browse Source
This commit is contained in:
DEKA_123
2023-08-11 10:59:53 +08:00
parent 361b302407
commit 2021d67d03
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
service/calculate/pooled.go
View File

@@ -4,7 +4,7 @@ import (
"electricity_bill_calc/model"
"electricity_bill_calc/model/calculate"
"electricity_bill_calc/repository"
"fmt"
"electricity_bill_calc/types"
"github.com/shopspring/decimal"
"time"
"unsafe"
@@ -44,7 +44,10 @@ func PooledMetersCalculate(report *model.ReportIndex, periodStart time.Time,
func determinePublicMeterConsumptions(meterId string, periodStart time.Time,
periodEnd time.Time, readings []model.MeterReading,
meterDetail model.MeterDetail, summary calculate.Summary) (calculate.Meter, error) {
fmt.Println(meterDetail.DetachedAt)
if meterDetail.DetachedAt == nil {
zeroTime := time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC)
meterDetail.DetachedAt = &types.DateTime{Time: zeroTime}
}
startReading, err := DeterminePublicMeterStartReading(meterId, periodStart, meterDetail.DetachedAt.Time, readings)
if err != nil {
return calculate.Meter{}, err