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

fix(#27): 修复用户电量电费详细为空

Browse Source
This commit is contained in:
ZiHangQin
2023-08-15 14:13:25 +08:00
parent 7d3fafeb04
commit 2844db1a86
4 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
service/calculate/meters.go
View File

@@ -151,9 +151,9 @@ func CalculateLossPooling(report model.ReportIndex, summary calculate.Summary, m
/// 计算所有商户类型表计的全周期电量。
func CalculateTenementConsumptions(meters MeterMap) (map[string]decimal.Decimal, error) {
func CalculateTenementConsumptions(meters *MeterMap) (map[string]decimal.Decimal, error) {
consumptions := make(map[string]decimal.Decimal)
for _, meter := range meters {
for _, meter := range *meters {
if meter.Detail.MeterType == model.METER_INSTALLATION_TENEMENT {
amount, ok := consumptions[meter.Code]
if !ok {
@@ -163,7 +163,7 @@ func CalculateTenementConsumptions(meters MeterMap) (map[string]decimal.Decimal,
consumptions[meter.Code] = amount
}
}
for _, meter := range meters {
for _, meter := range *meters {
if meter.Detail.MeterType == model.METER_INSTALLATION_TENEMENT {
amount, ok := consumptions[meter.Code]
if !ok {

2
service/calculate/wattCost.go
View File

@@ -110,7 +110,7 @@ func MainCalculateProcess(rid string) error {
return err
}
// 计算所有商户类型表计的全周期电量，并根据全周期电量计算共用过同一表计的商户的二次分摊比例。
_, err = CalculateTenementConsumptions(meters)
_, err = CalculateTenementConsumptions(&meters)
if err != nil {
fmt.Println("16", err)
return err