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:
DEKA_123
2023-08-14 13:49:48 +08:00
parent bfa7ac1508 3f36153968
commit 37bd0da1f2
4 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service/calculate/persist.go
View File

@@ -11,10 +11,10 @@ import (
)
// 向数据库保存核算概况结果
func SaveSummary(tx pgx.Tx, summary calculate.Summary) error {
func SaveSummary(tx pgx.Tx, ctx context.Context, summary calculate.Summary) error {
// 保存核算概况结果到数据库
err := repository.CalculateRepository.SaveReportSummary(tx, summary)
err := repository.CalculateRepository.SaveReportSummary(tx,ctx, summary)
if err != nil {
return err
}

5
service/calculate/wattCost.go
View File

@@ -62,7 +62,7 @@ func MainCalculateProcess(rid string) error {
fmt.Println("8", err)
return err
}
fmt.Println(parkMetersReports, "看看物业所有表计电量是否为空", tenementReports, summary)
// 计算所有表计的总电量
parkTotal := TotalConsumptionCalculate(tenementReports, summary)
@@ -73,7 +73,6 @@ func MainCalculateProcess(rid string) error {
return err
}
// 计算所有已经启用的商铺面积总和，仅计算所有未迁出的商户的所有表计对应的商铺面积。
_, err = EnabledAreaCalculate(&tenementReports, &summary)
if err != nil {
@@ -135,7 +134,7 @@ func MainCalculateProcess(rid string) error {
return err
}
err = SaveSummary(tx, summary)
err = SaveSummary(tx, ctx, summary)
if err != nil {
_ = tx.Rollback(ctx)
fmt.Println("19", err)