From 900b9cccebf213f5e17d7ff1376d6880b632b88b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Wed, 10 Aug 2022 15:47:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(model):=E5=9F=BA=E6=9C=AC=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=95=B0=E6=8D=AE=E5=BA=93=E7=BB=93=E6=9E=84=E7=9A=84?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/end_user_detail.go | 41 ++++++++++++++++++++++++++++++++++++++++ model/report_summary.go | 2 +- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 model/end_user_detail.go diff --git a/model/end_user_detail.go b/model/end_user_detail.go new file mode 100644 index 0000000..9f5b3bd --- /dev/null +++ b/model/end_user_detail.go @@ -0,0 +1,41 @@ +package model + +import "github.com/shopspring/decimal" + +type EndUserDetail struct { + CreatedAndModified `xorm:"extends"` + ReportId string `xorm:"varchar(120) pk notnull" json:"-"` + MeterId string `xorm:"meter_04kv_id varchar(120) pk notnull" json:"meterId"` + LastPeriodCritical decimal.NullDecimal `xorm:"decimal(14,2)" json:"lastPeriodCritical"` + LastPeriodPeek decimal.NullDecimal `xorm:"decimal(14,2)" json:"lastPeriodPeek"` + LastPeriodFlat decimal.Decimal `xorm:"decimal(14,2) notnull" json:"lastPeriodFlat"` + LastPeriodValley decimal.NullDecimal `xorm:"decimal(14,2)" json:"lastPeriodValley"` + CurrentPeriodCritical decimal.NullDecimal `xorm:"decimal(14,2)" json:"currentPeriodCritical"` + CurrentPeriodPeek decimal.NullDecimal `xorm:"decimal(14,2)" json:"currentPeriodPeek"` + CurrentPeriodFlat decimal.Decimal `xorm:"decimal(14,2) notnull" json:"currentPeriodFlat"` + CurrentPeriodValley decimal.NullDecimal `xorm:"decimal(14,2)" json:"currentPeriodValley"` + AdjustCritical decimal.NullDecimal `xorm:"decimal(14,2)" json:"adjustCritical"` + AdjustPeek decimal.NullDecimal `xorm:"decimal(14,2)" json:"adjustPeek"` + AdjustFlat decimal.Decimal `xorm:"decimal(14,2) notnull" json:"adjustFlat"` + AdjustValley decimal.NullDecimal `xorm:"decimal(14,2)" json:"adjustValley"` + Critical decimal.NullDecimal `xorm:"decimal(14,2)" json:"critical"` + CriticalFee decimal.NullDecimal `xorm:"decimal(18,8)" json:"criticalFee"` + Peek decimal.NullDecimal `xorm:"decimal(14,2)" json:"peek"` + PeekFee decimal.NullDecimal `xorm:"decimal(18,8)" json:"peekFee"` + Flat decimal.Decimal `xorm:"decimal(14,2) notnull" json:"flat"` + FlatFee decimal.Decimal `xorm:"decimal(18,8) notnull" json:"flatFee"` + Valley decimal.NullDecimal `xorm:"decimal(14,2)" json:"valley"` + ValleyFee decimal.NullDecimal `xorm:"decimal(18,8)" json:"valleyFee"` + BasicFeeDiluted decimal.NullDecimal `xorm:"decimal(18,8)" json:"basicFeeDiluted"` + AdjustFeeDiluted decimal.NullDecimal `xorm:"decimal(18,8)" json:"adjustFeeDiluted"` + LossDiluted decimal.NullDecimal `xorm:"decimal(18,8)" json:"lossDiluted"` + LossFeeDiluted decimal.NullDecimal `xorm:"decimal(18,8)" json:"lossFeeDiluted"` + MaintenanceFeeDiluted decimal.NullDecimal `xorm:"decimal(18,8)" json:"maintenanceFeeDiluted"` + PublicConsumptionDiluted decimal.NullDecimal `xorm:"decimal(18,8)" json:"publicConsumptionDiluted"` + ServiceFeeDiluted decimal.NullDecimal `xorm:"decimal(18,8)" json:"serviceFeeDiluted"` + FinalCharge decimal.NullDecimal `xorm:"decimal(14,2)" json:"finalCharge"` +} + +func (EndUserDetail) TableName() string { + return "end_user_detail" +} diff --git a/model/report_summary.go b/model/report_summary.go index a1c9843..582623d 100644 --- a/model/report_summary.go +++ b/model/report_summary.go @@ -3,7 +3,7 @@ package model import "github.com/shopspring/decimal" type ReportSummary struct { - ReportId string `xorm:"varchar(120) pk notnull" json:"reportId"` + ReportId string `xorm:"varchar(120) pk notnull" json:"-"` Overall decimal.Decimal `xorm:"decimal(14,2) notnull" json:"overall"` OverallFee decimal.Decimal `xorm:"decimal(14,2) notnull" json:"overallFee"` OverallPrice decimal.Decimal `xorm:"decimal(16,8)" json:"overallPrice"`