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

* fixbug/359-bowen-balance-to-int64:
  积分消耗改成小数
  fixbug
  积分消耗改Int

# Conflicts:
#	internal/logic/dashboard/get_charts_logic.go

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 *ChartsFloat `json:"consume_coin"`
+		ConsumeCoin *ChartsStr `json:"consume_coin"`
     }
 
     ChartsUint {
@@ -51,6 +51,23 @@ type (
 		LabelText string `json:"labelText"`
 		Tip *string `json:"tip"`
 	}
+	ChartsMix {
+        Count int64 `json:"count"`
+        Rate *float32 `json:"rate"`
+        Label []string `json:"label"`
+        Val []float64 `json:"val"`
+        LabelText string `json:"labelText"`
+        Tip *string `json:"tip"`
+    }
+
+    ChartsStr {
+        Count string `json:"count"`
+        Rate *float32 `json:"rate"`
+        Label []string `json:"label"`
+        Val []float64 `json:"val"`
+        LabelText string `json:"labelText"`
+        Tip *string `json:"tip"`
+    }
 
     ChartsInt {
         Count int64 `json:"count"`

internal/logic/dashboard/get_charts_logic.go

@@ -500,6 +500,13 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 		}
 	}
 	accountBalance.Count = 0
+
+	consumeCoinInt := types.ChartsStr{}
+	consumeCoinInt.Count = fmt.Sprintf("%.6f", consumeCoin.Count)
+	consumeCoinInt.Val = consumeCoin.Val
+	consumeCoinInt.Label = consumeCoin.Label
+	consumeCoinInt.LabelText = consumeCoin.LabelText
+
 	chartsData := types.ChartsData{
 		AiResponse:     &aiResponse,
 		SopRun:         &sopRun,
@@ -507,7 +514,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 		TotalGroup:     &totalGroup,
 		AccountBalance: &accountBalance,
 		ConsumeToken:   &consumeToken,
-		ConsumeCoin:    &consumeCoin,
+		ConsumeCoin:    &consumeCoinInt,
 		ActiveUser:     &activeUser,
 		NewUser:        &newUser,
 		LabelDist:      labelsData,

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    *ChartsFloat `json:"consume_coin"`
+	ConsumeCoin    *ChartsStr   `json:"consume_coin"`
 }
 
 type ChartsUint struct {
@@ -3613,6 +3613,24 @@ type ChartsFloat struct {
 	Tip       *string   `json:"tip"`
 }
 
+type ChartsMix struct {
+	Count     int64     `json:"count"`
+	Rate      *float32  `json:"rate"`
+	Label     []string  `json:"label"`
+	Val       []float64 `json:"val"`
+	LabelText string    `json:"labelText"`
+	Tip       *string   `json:"tip"`
+}
+
+type ChartsStr struct {
+	Count     string    `json:"count"`
+	Rate      *float32  `json:"rate"`
+	Label     []string  `json:"label"`
+	Val       []float64 `json:"val"`
+	LabelText string    `json:"labelText"`
+	Tip       *string   `json:"tip"`
+}
+
 type ChartsInt struct {
 	Count     int64    `json:"count"`
 	Rate      *float32 `json:"rate"`