fix(#27): 未完全修复成功

service/calculate/persist.go

@@ -2,7 +2,6 @@ package calculate
 
 import (
 	"context"
-	"electricity_bill_calc/global"
 	"electricity_bill_calc/model"
 	"electricity_bill_calc/model/calculate"
 	"electricity_bill_calc/repository"
@@ -40,8 +39,6 @@ func SavePublics(tx pgx.Tx, ctx context.Context, report model.ReportIndex, meter
 }
 
 func SavePoolings(tx pgx.Tx, report model.ReportIndex, meters MeterMap, relations []model.MeterRelation) error {
-	ctx, cancel := global.TimeoutContext()
-	defer cancel()
 	var poolingMeters []calculate.Meter
 	var tenementMeters []calculate.Meter
 	// 根据条件筛选 Meter 并保存到对应的数组中
@@ -56,13 +53,9 @@ func SavePoolings(tx pgx.Tx, report model.ReportIndex, meters MeterMap, relation
 	if err != nil {
 		return err
 	}
-	tx.Commit(ctx)
-
 	return nil
 }
 func SaveTenements(tx pgx.Tx, report model.ReportIndex, tenement []calculate.PrimaryTenementStatistics, tc []calculate.TenementCharge) error {
-	ctx, cancel := global.TimeoutContext()
-	defer cancel()
 	var ts []model.Tenement
 	for _, r := range tenement {
 		ts = append(ts, r.Tenement)
@@ -71,7 +64,5 @@ func SaveTenements(tx pgx.Tx, report model.ReportIndex, tenement []calculate.Pri
 	if err != nil {
 		return err
 	}
-	tx.Commit(ctx)
-
 	return nil
 }

service/calculate/wattCost.go

@@ -158,6 +158,7 @@ func MainCalculateProcess(rid string) error {
 		fmt.Println("22", err)
 		return err
 	}
+	fmt.Println("商户分摊关系保存成功")
 	_ = tx.Commit(ctx)
 	return nil
 }