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

fix(tenement): 解决向园区中指定商户下绑定一个新的表计时时间异常问题

Browse Source
This commit is contained in:
ZiHangQin 2023-08-10 09:32:38 +08:00
parent 7f46f2f36b
commit 3d918eea85
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
repository/tenement.go
View File

@ -238,7 +238,7 @@ func (tr _TenementRepository) AddTenement(tx pgx.Tx, ctx context.Context, pid st
} }
// 向园区中指定商户下绑定一个新的表计 // 向园区中指定商户下绑定一个新的表计
func (tr _TenementRepository) BindMeter(tx pgx.Tx, ctx context.Context, pid, tid, meter string) error { func (tr _TenementRepository) BindMeter(tx pgx.Tx, ctx context.Context, pid, tid, meter string, form *vo.MeterReadingForm) error {
tr.log.Info("向园区中指定商户下绑定一个新的表计", zap.String("Park", pid), zap.String("Tenement", tid), zap.String("Meter", meter)) tr.log.Info("向园区中指定商户下绑定一个新的表计", zap.String("Park", pid), zap.String("Tenement", tid), zap.String("Meter", meter))
createSql, createArgs, _ := tr.ds. createSql, createArgs, _ := tr.ds.
@ -251,7 +251,7 @@ func (tr _TenementRepository) BindMeter(tx pgx.Tx, ctx context.Context, pid, tid
pid, pid,
tid, tid,
meter, meter,
types.Now(), form.ReadAt,
}, },
). ).
Prepared(true).ToSQL() Prepared(true).ToSQL()

2
service/calculate/pooled.go
View File

@ -4,7 +4,6 @@ import (
"electricity_bill_calc/model" "electricity_bill_calc/model"
"electricity_bill_calc/model/calculate" "electricity_bill_calc/model/calculate"
"electricity_bill_calc/repository" "electricity_bill_calc/repository"
"fmt"
"github.com/shopspring/decimal" "github.com/shopspring/decimal"
"time" "time"
"unsafe" "unsafe"
@ -25,7 +24,6 @@ func PooledMetersCalculate(report *model.ReportIndex, periodStart time.Time,
} }
poolingMeterReadings = append(poolingMeterReadings, lastTermPoolingMeterReadings...) poolingMeterReadings = append(poolingMeterReadings, lastTermPoolingMeterReadings...)
fmt.Println(poolingMeterReadings, "==============================================")
if len(poolingMeterReadings) <= 0 { if len(poolingMeterReadings) <= 0 {
return nil, nil return nil, nil
} }

12
service/calculate/wattCost.go
View File

@ -55,7 +55,7 @@ func MainCalculateProcess(rid string) error {
fmt.Println("7", err) fmt.Println("7", err)
return err return err
} }
fmt.Println(meterDetails,"看看是不是为空的")
// 获取所有的物业表计，然后对所有的物业表计电量进行计算。 // 获取所有的物业表计，然后对所有的物业表计电量进行计算。
parkMetersReports, err := MetersParkCalculate(*report, periodStart.Time, periodEnd.Time, meterDetails, summary) parkMetersReports, err := MetersParkCalculate(*report, periodStart.Time, periodEnd.Time, meterDetails, summary)
if err != nil { if err != nil {
@ -67,11 +67,11 @@ func MainCalculateProcess(rid string) error {
parkTotal := TotalConsumptionCalculate(tenementReports, summary) parkTotal := TotalConsumptionCalculate(tenementReports, summary)
//计算线损以及调整线损 //计算线损以及调整线损
//err = LossCalculate(report, parkMetersReports, &parkTotal, &summary) err = LossCalculate(report, parkMetersReports, &parkTotal, &summary)
//if err != nil { if err != nil {
// fmt.Println("9", err) fmt.Println("9", err)
// return err return err
//} }
fmt.Println(parkTotal) fmt.Println(parkTotal)
// 计算所有已经启用的商铺面积总和，仅计算所有未迁出的商户的所有表计对应的商铺面积。 // 计算所有已经启用的商铺面积总和，仅计算所有未迁出的商户的所有表计对应的商铺面积。

2
service/tenement.go
View File

@ -82,7 +82,7 @@ func (ts _TenementService) BindMeter(pid, tid, meterCode string, reading *vo.Met
tx.Rollback(ctx) tx.Rollback(ctx)
return fmt.Errorf("未能获取表计详细信息，%w", err) return fmt.Errorf("未能获取表计详细信息，%w", err)
} }
err = repository.TenementRepository.BindMeter(tx, ctx, pid, tid, meterCode) err = repository.TenementRepository.BindMeter(tx, ctx, pid, tid, meterCode,reading)
if err != nil { if err != nil {
ts.log.Error("向商户绑定一个新表计失败，未能绑定表计", zap.Error(err)) ts.log.Error("向商户绑定一个新表计失败，未能绑定表计", zap.Error(err))
tx.Rollback(ctx) tx.Rollback(ctx)