fix(#27): 未完全修复成功

model/calculate/calculate.go

@@ -49,20 +49,20 @@ type PrimaryTenementStatistics struct {
 }
 
 type TenementCharge struct {
-	Tenement     string
-	Overall      model.ConsumptionUnit
-	Critical     model.ConsumptionUnit
-	Peak         model.ConsumptionUnit
-	Flat         model.ConsumptionUnit
-	Valley       model.ConsumptionUnit
-	BasicFee     decimal.Decimal
-	AdjustFee    decimal.Decimal
-	LossPooled   decimal.Decimal
-	PublicPooled decimal.Decimal
-	FinalCharges decimal.Decimal
-	Loss         decimal.Decimal
-	Submeters    []*Meter
-	Poolings     []*Meter
+	Tenement     string `json:"tenement"`
+	Overall      model.ConsumptionUnit `json:"overall"`
+	Critical     model.ConsumptionUnit `json:"critical"`
+	Peak         model.ConsumptionUnit `json:"peak"`
+	Flat         model.ConsumptionUnit `json:"flat"`
+	Valley       model.ConsumptionUnit `json:"valley"`
+	BasicFee     decimal.Decimal `json:"basic_fee"`
+	AdjustFee    decimal.Decimal `json:"adjust_fee"`
+	LossPooled   decimal.Decimal `json:"loss_pooled"`
+	PublicPooled decimal.Decimal `json:"public_pooled"`
+	FinalCharges decimal.Decimal `json:"final_charges"`
+	Loss         decimal.Decimal `json:"loss"`
+	Submeters    []*Meter `json:"submeters"`
+	Poolings     []*Meter `json:"poolings"`
 }
 
 type Summary struct {

model/tenement.go

@@ -7,7 +7,7 @@ type Tenement struct {
 	Park           string          `json:"parkId" db:"park_id"`
 	FullName       string          `json:"fullName" db:"full_name"`
 	ShortName      *string         `json:"shortName" db:"short_name"`
-	Abbr           string          `json:"-"`
+	Abbr           string          `json:"abbr"`
 	Address        string          `json:"address"`
 	ContactName    string          `json:"contactName" db:"contact_name"`
 	ContactPhone   string          `json:"contactPhone" db:"contact_phone"`