Browse Source

Merge branch 'fixbug/359-bowen-balance-to-int64' into debug

* fixbug/359-bowen-balance-to-int64:
  fixbug
boweniac 4 days ago
parent
commit
ae4735d695

+ 3 - 3
desc/wechat/dashboard.api

@@ -31,7 +31,7 @@ type (
         ActiveUser *ChartsUint `json:"active_user"`
         NewUser *ChartsInt `json:"new_user"`
         LabelDist []LabelsData `json:"label_dist"`
-		ConsumeCoin *ChartsInt `json:"consume_coin"`
+		ConsumeCoin *ChartsMix `json:"consume_coin"`
     }
 
     ChartsUint {
@@ -51,8 +51,8 @@ type (
 		LabelText string `json:"labelText"`
 		Tip *string `json:"tip"`
 	}
-	ChartsStr {
-        Count string `json:"count"`
+	ChartsMix {
+        Count int64 `json:"count"`
         Rate *float32 `json:"rate"`
         Label []string `json:"label"`
         Val []float64 `json:"val"`

+ 1 - 1
internal/logic/dashboard/get_charts_logic.go

@@ -500,7 +500,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 		}
 	}
 
-	consumeCoinInt := types.ChartsInt{}
+	consumeCoinInt := types.ChartsMix{}
 	consumeCoinInt.Val = consumeCoin.Val
 	consumeCoinInt.Label = consumeCoin.Label
 	consumeCoinInt.LabelText = consumeCoin.LabelText

+ 3 - 3
internal/types/types.go

@@ -3592,7 +3592,7 @@ type ChartsData struct {
 	ActiveUser     *ChartsUint  `json:"active_user"`
 	NewUser        *ChartsInt   `json:"new_user"`
 	LabelDist      []LabelsData `json:"label_dist"`
-	ConsumeCoin    *ChartsInt   `json:"consume_coin"`
+	ConsumeCoin    *ChartsMix   `json:"consume_coin"`
 }
 
 type ChartsUint struct {
@@ -3613,8 +3613,8 @@ type ChartsFloat struct {
 	Tip       *string   `json:"tip"`
 }
 
-type ChartsStr struct {
-	Count     string    `json:"count"`
+type ChartsMix struct {
+	Count     int64     `json:"count"`
 	Rate      *float32  `json:"rate"`
 	Label     []string  `json:"label"`
 	Val       []float64 `json:"val"`