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

Merge branch '0.2' of https://git.archgrid.xyz/free-lancers/electricity_bill_calc_service into 0.2

Browse Source
This commit is contained in:
ZiHangQin
2023-08-14 16:34:16 +08:00
parent de176ce61d 8a383515d3
commit 292a50029f
6 changed files with 150 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controller/meter.go
View File

@@ -204,7 +204,7 @@ func replaceMeter(c *fiber.Ctx) error {
}
err := service.MeterService.ReplaceMeter(parkId, meterId, &replacementForm.OldReading, replacementForm.NewMeter.Code, replacementForm.NewMeter.Ratio, &replacementForm.NewMeter.Reading)
if err != nil {
meterLog.Error("更换表计出错", zap.Error(err))
meterLog.Error("更换表计出错1111", zap.Error(err))
return result.Error(500, err.Error())
}
return result.Success("更换成功")

8
controller/report.go
View File

@@ -258,14 +258,16 @@ func getReportSummary(c *fiber.Ctx) error {
},
Area: report.OverallArea,
BasicFee: report.BasicFee,
PooledBasicFeeByAmount: report.AuthorizeLoss.Amount,
PooledBasicFeeByAmount: report.BasicPooledPriceConsumption.Decimal,
PooledBasicFeeByArea: report.BasicPooledPriceArea.Decimal,
AdjustFee: report.AdjustFee,
PooledAdjustFeeByAmount: report.AdjustPooledPriceConsumption.Decimal,
PooledAdjustFeeByArea: report.AdjustPooledPriceArea.Decimal,
Consumption: report.ConsumptionFee.Decimal,
Loss: report.Loss.Decimal,
LossRate: report.LossFee.Decimal,
//Loss: report.Loss.Decimal,
Loss: report.AuthorizeLoss.Amount,
//LossRate: report.LossFee.Decimal,
LossRate: report.AuthorizeLoss.Proportion,
}
//copier.Copy(&summaryResponse, report)
return result.Success(