From 0a9d5cd1213a94e3962eb7b3c25558716b032364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Tue, 27 Jun 2023 15:28:11 +0800 Subject: [PATCH] =?UTF-8?q?fix(tenement):=E4=BF=AE=E6=AD=A3=E8=A1=A8?= =?UTF-8?q?=E8=AE=A1=E5=9C=A8=E6=8A=84=E8=A1=A8=E6=97=B6=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=90=88=E7=90=86=E6=80=A7=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller/tenement.go | 4 ++-- vo/reading.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/controller/tenement.go b/controller/tenement.go index a77a902..04dab4c 100644 --- a/controller/tenement.go +++ b/controller/tenement.go @@ -27,8 +27,8 @@ func InitializeTenementHandler(router *fiber.App) { router.Get("/tenement/:pid/:tid/meter", security.EnterpriseAuthorize, listMeters) router.Post("/tenement/:pid/:tid/move/out", security.EnterpriseAuthorize, moveOutTenement) router.Post("/tenement/:pid", security.EnterpriseAuthorize, addTenement) - router.Post("/tenement/:pid/:tid/meter/binding", security.EnterpriseAuthorize, bindMeterToTenement) - router.Post("/tenement/:pid/:tid/meter/binding/:code/unbind", security.EnterpriseAuthorize, unbindMeterFromTenement) + router.Post("/tenement/:pid/:tid/binding", security.EnterpriseAuthorize, bindMeterToTenement) + router.Post("/tenement/:pid/:tid/binding/:code/unbind", security.EnterpriseAuthorize, unbindMeterFromTenement) } // 列出园区中的商户 diff --git a/vo/reading.go b/vo/reading.go index 0826d01..1cbf30c 100644 --- a/vo/reading.go +++ b/vo/reading.go @@ -19,7 +19,7 @@ type MeterReadingForm struct { func (r MeterReadingForm) Validate() bool { flat := r.Overall.Sub(r.Critical).Sub(r.Peak).Sub(r.Valley) - return flat.LessThan(decimal.Zero) + return flat.GreaterThanOrEqual(decimal.Zero) } type MeterReadingFormWithCode struct {