From 3d918eea8535794c1b0c1637e698d4933f74d5e1 Mon Sep 17 00:00:00 2001
From: ZiHangQin <1420014281@qq.com>
Date: Thu, 10 Aug 2023 09:32:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(tenement):=20=E8=A7=A3=E5=86=B3=E5=90=91?=
 =?UTF-8?q?=E5=9B=AD=E5=8C=BA=E4=B8=AD=E6=8C=87=E5=AE=9A=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E4=B8=8B=E7=BB=91=E5=AE=9A=E4=B8=80=E4=B8=AA=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E8=A1=A8=E8=AE=A1=E6=97=B6=E6=97=B6=E9=97=B4=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 repository/tenement.go        |  4 ++--
 service/calculate/pooled.go   |  2 --
 service/calculate/wattCost.go | 12 ++++++------
 service/tenement.go           |  2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/repository/tenement.go b/repository/tenement.go
index beaffa7..88780de 100644
--- a/repository/tenement.go
+++ b/repository/tenement.go
@@ -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))
 
 	createSql, createArgs, _ := tr.ds.
@@ -251,7 +251,7 @@ func (tr _TenementRepository) BindMeter(tx pgx.Tx, ctx context.Context, pid, tid
 				pid,
 				tid,
 				meter,
-				types.Now(),
+				form.ReadAt,
 			},
 		).
 		Prepared(true).ToSQL()
diff --git a/service/calculate/pooled.go b/service/calculate/pooled.go
index 36b2839..ead36e8 100644
--- a/service/calculate/pooled.go
+++ b/service/calculate/pooled.go
@@ -4,7 +4,6 @@ import (
 	"electricity_bill_calc/model"
 	"electricity_bill_calc/model/calculate"
 	"electricity_bill_calc/repository"
-	"fmt"
 	"github.com/shopspring/decimal"
 	"time"
 	"unsafe"
@@ -25,7 +24,6 @@ func PooledMetersCalculate(report *model.ReportIndex, periodStart time.Time,
 	}
 
 	poolingMeterReadings = append(poolingMeterReadings, lastTermPoolingMeterReadings...)
-	fmt.Println(poolingMeterReadings, "==============================================")
 	if len(poolingMeterReadings) <= 0 {
 		return nil, nil
 	}
diff --git a/service/calculate/wattCost.go b/service/calculate/wattCost.go
index 163e391..1b21892 100644
--- a/service/calculate/wattCost.go
+++ b/service/calculate/wattCost.go
@@ -55,7 +55,7 @@ func MainCalculateProcess(rid string) error {
 		fmt.Println("7", err)
 		return err
 	}
-
+	fmt.Println(meterDetails,"看看是不是为空的")
 	// 获取所有的物业表计，然后对所有的物业表计电量进行计算。
 	parkMetersReports, err := MetersParkCalculate(*report, periodStart.Time, periodEnd.Time, meterDetails, summary)
 	if err != nil {
@@ -67,11 +67,11 @@ func MainCalculateProcess(rid string) error {
 	parkTotal := TotalConsumptionCalculate(tenementReports, summary)
 
 	//计算线损以及调整线损
-	//err = LossCalculate(report, parkMetersReports, &parkTotal, &summary)
-	//if err != nil {
-	//	fmt.Println("9", err)
-	//	return err
-	//}
+	err = LossCalculate(report, parkMetersReports, &parkTotal, &summary)
+	if err != nil {
+		fmt.Println("9", err)
+		return err
+	}
 	fmt.Println(parkTotal)
 
 	// 计算所有已经启用的商铺面积总和，仅计算所有未迁出的商户的所有表计对应的商铺面积。
diff --git a/service/tenement.go b/service/tenement.go
index ab56299..3eb7fc9 100644
--- a/service/tenement.go
+++ b/service/tenement.go
@@ -82,7 +82,7 @@ func (ts _TenementService) BindMeter(pid, tid, meterCode string, reading *vo.Met
 		tx.Rollback(ctx)
 		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 {
 		ts.log.Error("向商户绑定一个新表计失败，未能绑定表计", zap.Error(err))
 		tx.Rollback(ctx)