From 01953132cac1247370f7a9373f3d9ac8ec59466f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= <midnite@outlook.com>
Date: Mon, 19 Sep 2022 12:19:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(meter):=E7=BB=88=E7=AB=AF=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=A1=A8=E8=AE=A1=E6=A1=A3=E6=A1=88=E5=AE=8C=E6=88=90=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=B0=83=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/meter04kv.go | 3 +++
 model/meter_04kv.go     | 6 +++---
 service/meter04kv.go    | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/controller/meter04kv.go b/controller/meter04kv.go
index 1270ec9..79d698e 100644
--- a/controller/meter04kv.go
+++ b/controller/meter04kv.go
@@ -2,6 +2,7 @@ package controller
 
 import (
 	"electricity_bill_calc/excel"
+	"electricity_bill_calc/logger"
 	"electricity_bill_calc/model"
 	"electricity_bill_calc/response"
 	"electricity_bill_calc/security"
@@ -14,6 +15,7 @@ import (
 	"github.com/jinzhu/copier"
 	"github.com/samber/lo"
 	"github.com/shopspring/decimal"
+	"go.uber.org/zap"
 )
 
 func InitializeMeter04kVController(router *gin.Engine) {
@@ -149,6 +151,7 @@ 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/model/meter_04kv.go b/model/meter_04kv.go
index 6aac9c4..9854944 100644
--- a/model/meter_04kv.go
+++ b/model/meter_04kv.go
@@ -19,9 +19,9 @@ type Meter04KV struct {
 	ContactPhone       *string         `json:"contactPhone" excel:"phone"`
 	Ratio              decimal.Decimal `bun:",notnull,default:1" json:"ratio" excel:"ratio"`
 	Seq                int64           `bun:"type:bigint,notnull" json:"seq" excel:"seq"`
-	IsPublicMeter      bool            `bun:"public_meter,notnull,default:false" json:"isPublicMeter" excel:"public"`
-	WillDilute         bool            `bun:"dilute,notnull,default:false" json:"willDilute" excel:"dilute"`
-	Enabled            bool            `bun:",notnull,default:true" json:"enabled"`
+	IsPublicMeter      bool            `bun:"public_meter,notnull" json:"isPublicMeter" excel:"public"`
+	WillDilute         bool            `bun:"dilute,notnull" json:"willDilute" excel:"dilute"`
+	Enabled            bool            `bun:",notnull" json:"enabled"`
 	ParkDetail         *Park           `bun:"rel:belongs-to,join:park_id=id" json:"-"`
 }
 
diff --git a/service/meter04kv.go b/service/meter04kv.go
index a4a23a4..3cae985 100644
--- a/service/meter04kv.go
+++ b/service/meter04kv.go
@@ -77,7 +77,7 @@ func (_Meter04kVService) Get04kVMeterDetail(park, code string) (*model.Meter04KV
 	var meter = new(model.Meter04KV)
 	ctx, cancel := global.TimeoutContext()
 	defer cancel()
-	err := global.DB.NewSelect().Model(&meter).
+	err := global.DB.NewSelect().Model(meter).
 		Where("code = ?", code).
 		Where("park_id = ?", park).
 		Scan(ctx)
@@ -101,7 +101,7 @@ func (_Meter04kVService) insertNewMeter(tx *bun.Tx, ctx *context.Context, meter
 }
 
 func (_Meter04kVService) updateMeter(tx *bun.Tx, ctx *context.Context, meter model.Meter04KV) error {
-	_, err := tx.NewUpdate().Model(meter).
+	_, 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").