From c472eb41967dd5835d4e53bf20b50f7b1437a45d Mon Sep 17 00:00:00 2001
From: DEKA_123 <1904876928@qq.com>
Date: Fri, 11 Aug 2023 09:02:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(#17):=E4=BF=AE=E5=A4=8D=E6=9C=89=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E8=A1=A8=E8=AE=A1=E7=9A=84=E5=95=86=E6=88=B7=E8=BF=81?=
 =?UTF-8?q?=E5=87=BA=E6=97=B6=E6=97=A0=E6=B3=95=E8=BF=81=E5=87=BA=E7=9A=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/tenement.go | 5 ++---
 vo/reading.go       | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/service/tenement.go b/service/tenement.go
index 3eb7fc9..0ee366e 100644
--- a/service/tenement.go
+++ b/service/tenement.go
@@ -7,7 +7,6 @@ import (
 	"electricity_bill_calc/repository"
 	"electricity_bill_calc/vo"
 	"fmt"
-
 	"github.com/samber/lo"
 	"go.uber.org/zap"
 )
@@ -82,7 +81,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,reading)
+	err = repository.TenementRepository.BindMeter(tx, ctx, pid, tid, meterCode, reading)
 	if err != nil {
 		ts.log.Error("向商户绑定一个新表计失败，未能绑定表计", zap.Error(err))
 		tx.Rollback(ctx)
@@ -201,7 +200,7 @@ func (ts _TenementService) MoveOutTenement(pid, tid string, reading []*vo.MeterR
 			tx.Rollback(ctx)
 			return fmt.Errorf("找不到指定表计[%s]的抄表信息，%w", meterCode, err)
 		}
-		if reading.Validate() {
+		if !reading.Validate() {
 			ts.log.Error("迁出指定商户失败，表计读数不能正确配平，尖锋电量、峰电量、谷电量之和超过总电量。", zap.String("Meter", meterCode))
 			tx.Rollback(ctx)
 			return fmt.Errorf("表计[%s]读数不能正确配平，尖锋电量、峰电量、谷电量之和超过总电量。", meterCode)
diff --git a/vo/reading.go b/vo/reading.go
index 1cbf30c..79dcc8e 100644
--- a/vo/reading.go
+++ b/vo/reading.go
@@ -4,7 +4,6 @@ import (
 	"electricity_bill_calc/model"
 	"electricity_bill_calc/types"
 	"fmt"
-
 	"github.com/shopspring/decimal"
 )
 
@@ -19,7 +18,8 @@ type MeterReadingForm struct {
 
 func (r MeterReadingForm) Validate() bool {
 	flat := r.Overall.Sub(r.Critical).Sub(r.Peak).Sub(r.Valley)
-	return flat.GreaterThanOrEqual(decimal.Zero)
+	b := flat.GreaterThanOrEqual(decimal.Zero)
+	return b
 }
 
 type MeterReadingFormWithCode struct {