From df9bf83bb84a1eac33b77a2b7d45b7e0189d31de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= <midnite@outlook.com>
Date: Fri, 23 Sep 2022 15:53:56 +0800
Subject: [PATCH] =?UTF-8?q?fix(deprecates):=E7=BB=A7=E7=BB=AD=E6=B8=85?=
 =?UTF-8?q?=E7=90=86=E5=B7=B2=E7=BB=8F=E5=88=A0=E9=99=A4=E7=9A=84=E8=A1=A8?=
 =?UTF-8?q?=E8=AE=A1=E6=91=8A=E8=96=84=E5=AD=97=E6=AE=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/meter04kv.go | 5 -----
 service/god_mode.go     | 1 -
 service/meter04kv.go    | 4 ++--
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/controller/meter04kv.go b/controller/meter04kv.go
index 79d698e..a6fd498 100644
--- a/controller/meter04kv.go
+++ b/controller/meter04kv.go
@@ -2,7 +2,6 @@ package controller
 
 import (
 	"electricity_bill_calc/excel"
-	"electricity_bill_calc/logger"
 	"electricity_bill_calc/model"
 	"electricity_bill_calc/response"
 	"electricity_bill_calc/security"
@@ -15,7 +14,6 @@ import (
 	"github.com/jinzhu/copier"
 	"github.com/samber/lo"
 	"github.com/shopspring/decimal"
-	"go.uber.org/zap"
 )
 
 func InitializeMeter04kVController(router *gin.Engine) {
@@ -96,7 +94,6 @@ type _MeterModificationFormData struct {
 	Ratio         decimal.Decimal `json:"ratio" form:"ratio"`
 	Seq           int             `json:"seq" form:"seq"`
 	IsPublicMeter bool            `json:"isPublicMeter" form:"isPublicMeter"`
-	WillDilute    bool            `json:"willDilute" form:"willDilute"`
 	Enabled       bool            `json:"enabled" form:"enabled"`
 }
 
@@ -109,7 +106,6 @@ type _MeterCreationFormData struct {
 	Ratio         decimal.Decimal `json:"ratio" form:"ratio"`
 	Seq           int             `json:"seq" form:"seq"`
 	IsPublicMeter bool            `json:"isPublicMeter" form:"isPublicMeter"`
-	WillDilute    bool            `json:"willDilute" form:"willDilute"`
 	Enabled       bool            `json:"enabled" form:"enabled"`
 }
 
@@ -151,7 +147,6 @@ func modifySingle04kVMeter(c *gin.Context) {
 	formData := new(_MeterModificationFormData)
 	c.BindJSON(formData)
 	copier.Copy(meterDetail, formData)
-	logger.Named("Controller", "Meter").Debug("Check #1", zap.Any("meter", meterDetail))
 	err = service.Meter04kVService.UpdateSingleMeter(meterDetail)
 	if err != nil {
 		result.Error(http.StatusInternalServerError, err.Error())
diff --git a/service/god_mode.go b/service/god_mode.go
index e914b92..044b423 100644
--- a/service/god_mode.go
+++ b/service/god_mode.go
@@ -255,7 +255,6 @@ func (g _GodModeService) resynchronizeEndUserArchives(tx *bun.Tx, ctx *context.C
 				"contact_phone",
 				"seq",
 				"public_meter",
-				"dilute",
 			)
 			if err != nil {
 				return success, err
diff --git a/service/meter04kv.go b/service/meter04kv.go
index 7b08c70..04c901a 100644
--- a/service/meter04kv.go
+++ b/service/meter04kv.go
@@ -101,7 +101,7 @@ func (_Meter04kVService) updateMeter(tx *bun.Tx, ctx *context.Context, meter mod
 	_, err := tx.NewUpdate().Model(&meter).
 		Where("code = ?", meter.Code).
 		Where("park_id = ?", meter.ParkId).
-		Column("address", "customer_name", "contact_name", "contact_phone", "ratio", "seq", "public_meter", "dilute", "enabled").
+		Column("address", "customer_name", "contact_name", "contact_phone", "ratio", "seq", "public_meter", "enabled").
 		Exec(*ctx)
 	if err != nil {
 		tx.Rollback()
@@ -206,7 +206,7 @@ func (m _Meter04kVService) BatchCreateMeter(meters []model.Meter04KV) error {
 	}
 	if len(updates) > 0 {
 		_, err = tx.NewUpdate().Model(&updates).
-			Column("address", "customer_name", "contact_name", "contact_phone", "ratio", "seq", "public_meter", "dilute", "enabled").
+			Column("address", "customer_name", "contact_name", "contact_phone", "ratio", "seq", "public_meter", "enabled").
 			Bulk().
 			Exec(ctx)
 		if err != nil {