浏览代码

fix:积分消耗改为float;数字面板修改

jimmyyem 5 天之前
父节点
当前提交
60c6aee67a

+ 12 - 15
crontask/compute_statistic.go

@@ -1,7 +1,6 @@
 package crontask
 
 import (
-	"math"
 	"strconv"
 	"strings"
 	"time"
@@ -127,7 +126,6 @@ func (l *CronTask) computeStatistic() {
 
 			// 消耗Token数:usage_detail 表
 			consumeTokenInt, _ = l.svcCtx.DB.UsageDetail.Query().Where(
-				usagedetail.TypeEQ(1),
 				usagedetail.BotID(wxinfo.Wxid),
 				usagedetail.CreatedAtGTE(lastHour),
 				usagedetail.CreatedAtLT(currentHour),
@@ -138,7 +136,6 @@ func (l *CronTask) computeStatistic() {
 			// 计算积分消耗
 			consumeCoinFloat, _ = l.svcCtx.DB.UsageDetail.Query().Where(
 				usagedetail.BotID(wxinfo.Wxid),
-				usagedetail.OrganizationID(orgID),
 				usagedetail.CreatedAtGTE(lastHour),
 				usagedetail.CreatedAtLT(currentHour),
 			).Aggregate(ent.Sum("credits")).Float64(l.ctx)
@@ -152,7 +149,7 @@ func (l *CronTask) computeStatistic() {
 
 			// 活跃好友:usage_detail 表 type = 1
 			activeUsers, _ := l.svcCtx.DB.UsageDetail.Query().Where(
-				usagedetail.Type(1),
+				usagedetail.TypeIn(1, 6),
 				usagedetail.BotID(wxinfo.Wxid),
 				usagedetail.CreatedAtGTE(lastHour),
 				usagedetail.CreatedAtLT(currentHour),
@@ -185,7 +182,7 @@ func (l *CronTask) computeStatistic() {
 				SetTotalGroup(uint64(groupCountInt)).
 				SetAccountBalance(uint64(accountBalanceInt)).
 				SetConsumeToken(uint64(consumeTokenInt)).
-				SetConsumeCoin(uint64(math.Ceil(consumeCoinFloat))).
+				SetConsumeCoin(consumeCoinFloat).
 				SetActiveUser(uint64(activeUserInt)).
 				SetNewUser(int64(newUserInt)).
 				SetAddtime(uint64(lastHourInt)).
@@ -220,7 +217,7 @@ func (l *CronTask) computeStatistic() {
 			SetTotalGroup(uint64(orgGroupCountInt)).
 			SetAccountBalance(uint64(orgAccountBalanceInt)).
 			SetConsumeToken(uint64(orgConsumeTokenInt)).
-			SetConsumeCoin(uint64(math.Ceil(orgHourConsumeCoinFloat))).
+			SetConsumeCoin(orgHourConsumeCoinFloat).
 			SetActiveUser(uint64(orgActiveUserInt)).
 			SetNewUser(int64(orgNewUserInt)).
 			SetAddtime(uint64(lastHourInt)).
@@ -246,7 +243,7 @@ func (l *CronTask) computeStatistic() {
 			SetTotalGroup(uint64(allHourGroupCountInt)).
 			SetAccountBalance(uint64(allHourAccountBalanceInt)).
 			SetConsumeToken(uint64(allHourConsumeTokenInt)).
-			SetConsumeCoin(uint64(math.Ceil(allHourConsumeCoinFloat))).
+			SetConsumeCoin(allHourConsumeCoinFloat).
 			SetActiveUser(uint64(allHourActiveUserInt)).
 			SetNewUser(int64(allHourNewUserInt)).
 			SetAddtime(uint64(lastHourInt)).
@@ -274,11 +271,11 @@ func (l *CronTask) computeStatistic() {
 
 	var allDayAiResponseInt, allDaySopRunInt, allDayFriendCountInt, allDayGroupCountInt, allDayAccountBalanceInt, allDayConsumeTokenInt, allDayActiveUserInt uint64
 	var allDayNewUserInt int64
-	var allDayConsumeCoinInt uint64
+	var allDayConsumeCoinFloat float64
 	for orgID, wxinfos := range wxbotsSet {
 		var orgAiResponseInt, orgSopRunInt, orgFriendCountInt, orgGroupCountInt, orgAccountBalanceInt, orgConsumeTokenInt, orgActiveUserInt uint64
 		var orgNewUserInt int64
-		var orgDayConsumeCoinInt uint64
+		var orgDayConsumeCoinFloat float64
 		for _, wxinfo := range wxinfos {
 			l.Logger.Infof("开始计算日数据:%d\n", yesterdayInt)
 
@@ -294,7 +291,7 @@ func (l *CronTask) computeStatistic() {
 			}
 			var aiResponse, sopRun, totalFriend, totalGroup, accountBalance, consumeToken, activeUser uint64
 			var newUser int64
-			var consumeCoin uint64
+			var consumeCoin float64
 			for _, hourData := range hourDataBatch {
 				aiResponse += hourData.AiResponse
 				sopRun += hourData.SopRun
@@ -309,7 +306,7 @@ func (l *CronTask) computeStatistic() {
 
 			// 活跃好友:usage_detail 表 type = 1
 			activeUsers, _ := l.svcCtx.DB.UsageDetail.Query().Where(
-				usagedetail.Type(1),
+				usagedetail.TypeIn(1, 6),
 				usagedetail.BotID(wxinfo.Wxid),
 				usagedetail.CreatedAtGTE(yesterdayFirstHour),
 				usagedetail.CreatedAtLT(yesterdayLastHour),
@@ -324,7 +321,7 @@ func (l *CronTask) computeStatistic() {
 			orgConsumeTokenInt += consumeToken
 			orgActiveUserInt += activeUser
 			orgNewUserInt += newUser
-			orgDayConsumeCoinInt += consumeCoin
+			orgDayConsumeCoinFloat += consumeCoin
 
 			allDayAiResponseInt += aiResponse
 			allDaySopRunInt += sopRun
@@ -334,7 +331,7 @@ func (l *CronTask) computeStatistic() {
 			allDayConsumeTokenInt += consumeToken
 			allDayActiveUserInt += activeUser
 			allDayNewUserInt += newUser
-			allDayConsumeCoinInt += consumeCoin
+			allDayConsumeCoinFloat += consumeCoin
 
 			// 先判断该账号是否已经统计了日数据,如果已经统计了,就不需要再统计了
 			dayDataCount, _ := l.svcCtx.DB.UsageStatisticDay.Query().Where(
@@ -387,7 +384,7 @@ func (l *CronTask) computeStatistic() {
 				SetTotalGroup(orgGroupCountInt).
 				SetAccountBalance(orgAccountBalanceInt).
 				SetConsumeToken(orgConsumeTokenInt).
-				SetConsumeCoin(orgDayConsumeCoinInt).
+				SetConsumeCoin(orgDayConsumeCoinFloat).
 				SetActiveUser(orgActiveUserInt).
 				SetNewUser(orgNewUserInt).
 				SetNotNilLabelDist(LabelsCountSet[orgID]).
@@ -419,7 +416,7 @@ func (l *CronTask) computeStatistic() {
 			SetTotalGroup(allDayGroupCountInt).
 			SetAccountBalance(allDayAccountBalanceInt).
 			SetConsumeToken(allDayConsumeTokenInt).
-			SetConsumeCoin(allDayConsumeCoinInt).
+			SetConsumeCoin(allDayConsumeCoinFloat).
 			SetActiveUser(allDayActiveUserInt).
 			SetNewUser(allDayNewUserInt).
 			SetLabelDist(lc).

+ 10 - 1
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 *ChartsUint `json:"consume_coin"`
+		ConsumeCoin *ChartsFloat `json:"consume_coin"`
     }
 
     ChartsUint {
@@ -43,6 +43,15 @@ type (
         Tip *string `json:"tip"`
     }
 
+	ChartsFloat {
+		Count float64 `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"`
         Rate *float32 `json:"rate"`

+ 3 - 3
ent/migrate/schema.go

@@ -1067,7 +1067,7 @@ var (
 		{Name: "active_user", Type: field.TypeUint64, Comment: "活跃用户数"},
 		{Name: "new_user", Type: field.TypeInt64, Comment: "新增用户数"},
 		{Name: "label_dist", Type: field.TypeJSON, Comment: "标签分布"},
-		{Name: "consume_coin", Type: field.TypeUint64, Nullable: true, Comment: "消耗积分", Default: 0},
+		{Name: "consume_coin", Type: field.TypeFloat64, Nullable: true, Comment: "消耗积分", Default: 0},
 	}
 	// UsageStatisticDayTable holds the schema information for the "usage_statistic_day" table.
 	UsageStatisticDayTable = &schema.Table{
@@ -1107,7 +1107,7 @@ var (
 		{Name: "active_user", Type: field.TypeUint64, Comment: "活跃用户数"},
 		{Name: "new_user", Type: field.TypeInt64, Comment: "新增用户数"},
 		{Name: "label_dist", Type: field.TypeJSON, Comment: "标签分布"},
-		{Name: "consume_coin", Type: field.TypeUint64, Nullable: true, Comment: "消耗积分", Default: 0},
+		{Name: "consume_coin", Type: field.TypeFloat64, Nullable: true, Comment: "消耗积分", Default: 0},
 	}
 	// UsageStatisticHourTable holds the schema information for the "usage_statistic_hour" table.
 	UsageStatisticHourTable = &schema.Table{
@@ -1147,7 +1147,7 @@ var (
 		{Name: "active_user", Type: field.TypeUint64, Comment: "活跃用户数"},
 		{Name: "new_user", Type: field.TypeInt64, Comment: "新增用户数"},
 		{Name: "label_dist", Type: field.TypeJSON, Comment: "标签分布"},
-		{Name: "consume_coin", Type: field.TypeUint64, Nullable: true, Comment: "消耗积分", Default: 0},
+		{Name: "consume_coin", Type: field.TypeFloat64, Nullable: true, Comment: "消耗积分", Default: 0},
 	}
 	// UsageStatisticMonthTable holds the schema information for the "usage_statistic_month" table.
 	UsageStatisticMonthTable = &schema.Table{

+ 39 - 39
ent/mutation.go

@@ -38014,8 +38014,8 @@ type UsageStatisticDayMutation struct {
 	addnew_user        *int64
 	label_dist         *[]custom_types.LabelDist
 	appendlabel_dist   []custom_types.LabelDist
-	consume_coin       *uint64
-	addconsume_coin    *int64
+	consume_coin       *float64
+	addconsume_coin    *float64
 	clearedFields      map[string]struct{}
 	done               bool
 	oldValue           func(context.Context) (*UsageStatisticDay, error)
@@ -39048,13 +39048,13 @@ func (m *UsageStatisticDayMutation) ResetLabelDist() {
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (m *UsageStatisticDayMutation) SetConsumeCoin(u uint64) {
-	m.consume_coin = &u
+func (m *UsageStatisticDayMutation) SetConsumeCoin(f float64) {
+	m.consume_coin = &f
 	m.addconsume_coin = nil
 }
 
 // ConsumeCoin returns the value of the "consume_coin" field in the mutation.
-func (m *UsageStatisticDayMutation) ConsumeCoin() (r uint64, exists bool) {
+func (m *UsageStatisticDayMutation) ConsumeCoin() (r float64, exists bool) {
 	v := m.consume_coin
 	if v == nil {
 		return
@@ -39065,7 +39065,7 @@ func (m *UsageStatisticDayMutation) ConsumeCoin() (r uint64, exists bool) {
 // OldConsumeCoin returns the old "consume_coin" field's value of the UsageStatisticDay entity.
 // If the UsageStatisticDay object wasn't provided to the builder, the object is fetched from the database.
 // An error is returned if the mutation operation is not UpdateOne, or the database query fails.
-func (m *UsageStatisticDayMutation) OldConsumeCoin(ctx context.Context) (v uint64, err error) {
+func (m *UsageStatisticDayMutation) OldConsumeCoin(ctx context.Context) (v float64, err error) {
 	if !m.op.Is(OpUpdateOne) {
 		return v, errors.New("OldConsumeCoin is only allowed on UpdateOne operations")
 	}
@@ -39079,17 +39079,17 @@ func (m *UsageStatisticDayMutation) OldConsumeCoin(ctx context.Context) (v uint6
 	return oldValue.ConsumeCoin, nil
 }
 
-// AddConsumeCoin adds u to the "consume_coin" field.
-func (m *UsageStatisticDayMutation) AddConsumeCoin(u int64) {
+// AddConsumeCoin adds f to the "consume_coin" field.
+func (m *UsageStatisticDayMutation) AddConsumeCoin(f float64) {
 	if m.addconsume_coin != nil {
-		*m.addconsume_coin += u
+		*m.addconsume_coin += f
 	} else {
-		m.addconsume_coin = &u
+		m.addconsume_coin = &f
 	}
 }
 
 // AddedConsumeCoin returns the value that was added to the "consume_coin" field in this mutation.
-func (m *UsageStatisticDayMutation) AddedConsumeCoin() (r int64, exists bool) {
+func (m *UsageStatisticDayMutation) AddedConsumeCoin() (r float64, exists bool) {
 	v := m.addconsume_coin
 	if v == nil {
 		return
@@ -39424,7 +39424,7 @@ func (m *UsageStatisticDayMutation) SetField(name string, value ent.Value) error
 		m.SetLabelDist(v)
 		return nil
 	case usagestatisticday.FieldConsumeCoin:
-		v, ok := value.(uint64)
+		v, ok := value.(float64)
 		if !ok {
 			return fmt.Errorf("unexpected type %T for field %s", value, name)
 		}
@@ -39605,7 +39605,7 @@ func (m *UsageStatisticDayMutation) AddField(name string, value ent.Value) error
 		m.AddNewUser(v)
 		return nil
 	case usagestatisticday.FieldConsumeCoin:
-		v, ok := value.(int64)
+		v, ok := value.(float64)
 		if !ok {
 			return fmt.Errorf("unexpected type %T for field %s", value, name)
 		}
@@ -39813,8 +39813,8 @@ type UsageStatisticHourMutation struct {
 	addnew_user        *int64
 	label_dist         *[]custom_types.LabelDist
 	appendlabel_dist   []custom_types.LabelDist
-	consume_coin       *uint64
-	addconsume_coin    *int64
+	consume_coin       *float64
+	addconsume_coin    *float64
 	clearedFields      map[string]struct{}
 	done               bool
 	oldValue           func(context.Context) (*UsageStatisticHour, error)
@@ -40847,13 +40847,13 @@ func (m *UsageStatisticHourMutation) ResetLabelDist() {
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (m *UsageStatisticHourMutation) SetConsumeCoin(u uint64) {
-	m.consume_coin = &u
+func (m *UsageStatisticHourMutation) SetConsumeCoin(f float64) {
+	m.consume_coin = &f
 	m.addconsume_coin = nil
 }
 
 // ConsumeCoin returns the value of the "consume_coin" field in the mutation.
-func (m *UsageStatisticHourMutation) ConsumeCoin() (r uint64, exists bool) {
+func (m *UsageStatisticHourMutation) ConsumeCoin() (r float64, exists bool) {
 	v := m.consume_coin
 	if v == nil {
 		return
@@ -40864,7 +40864,7 @@ func (m *UsageStatisticHourMutation) ConsumeCoin() (r uint64, exists bool) {
 // OldConsumeCoin returns the old "consume_coin" field's value of the UsageStatisticHour entity.
 // If the UsageStatisticHour object wasn't provided to the builder, the object is fetched from the database.
 // An error is returned if the mutation operation is not UpdateOne, or the database query fails.
-func (m *UsageStatisticHourMutation) OldConsumeCoin(ctx context.Context) (v uint64, err error) {
+func (m *UsageStatisticHourMutation) OldConsumeCoin(ctx context.Context) (v float64, err error) {
 	if !m.op.Is(OpUpdateOne) {
 		return v, errors.New("OldConsumeCoin is only allowed on UpdateOne operations")
 	}
@@ -40878,17 +40878,17 @@ func (m *UsageStatisticHourMutation) OldConsumeCoin(ctx context.Context) (v uint
 	return oldValue.ConsumeCoin, nil
 }
 
-// AddConsumeCoin adds u to the "consume_coin" field.
-func (m *UsageStatisticHourMutation) AddConsumeCoin(u int64) {
+// AddConsumeCoin adds f to the "consume_coin" field.
+func (m *UsageStatisticHourMutation) AddConsumeCoin(f float64) {
 	if m.addconsume_coin != nil {
-		*m.addconsume_coin += u
+		*m.addconsume_coin += f
 	} else {
-		m.addconsume_coin = &u
+		m.addconsume_coin = &f
 	}
 }
 
 // AddedConsumeCoin returns the value that was added to the "consume_coin" field in this mutation.
-func (m *UsageStatisticHourMutation) AddedConsumeCoin() (r int64, exists bool) {
+func (m *UsageStatisticHourMutation) AddedConsumeCoin() (r float64, exists bool) {
 	v := m.addconsume_coin
 	if v == nil {
 		return
@@ -41223,7 +41223,7 @@ func (m *UsageStatisticHourMutation) SetField(name string, value ent.Value) erro
 		m.SetLabelDist(v)
 		return nil
 	case usagestatistichour.FieldConsumeCoin:
-		v, ok := value.(uint64)
+		v, ok := value.(float64)
 		if !ok {
 			return fmt.Errorf("unexpected type %T for field %s", value, name)
 		}
@@ -41404,7 +41404,7 @@ func (m *UsageStatisticHourMutation) AddField(name string, value ent.Value) erro
 		m.AddNewUser(v)
 		return nil
 	case usagestatistichour.FieldConsumeCoin:
-		v, ok := value.(int64)
+		v, ok := value.(float64)
 		if !ok {
 			return fmt.Errorf("unexpected type %T for field %s", value, name)
 		}
@@ -41612,8 +41612,8 @@ type UsageStatisticMonthMutation struct {
 	addnew_user        *int64
 	label_dist         *[]custom_types.LabelDist
 	appendlabel_dist   []custom_types.LabelDist
-	consume_coin       *uint64
-	addconsume_coin    *int64
+	consume_coin       *float64
+	addconsume_coin    *float64
 	clearedFields      map[string]struct{}
 	done               bool
 	oldValue           func(context.Context) (*UsageStatisticMonth, error)
@@ -42646,13 +42646,13 @@ func (m *UsageStatisticMonthMutation) ResetLabelDist() {
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (m *UsageStatisticMonthMutation) SetConsumeCoin(u uint64) {
-	m.consume_coin = &u
+func (m *UsageStatisticMonthMutation) SetConsumeCoin(f float64) {
+	m.consume_coin = &f
 	m.addconsume_coin = nil
 }
 
 // ConsumeCoin returns the value of the "consume_coin" field in the mutation.
-func (m *UsageStatisticMonthMutation) ConsumeCoin() (r uint64, exists bool) {
+func (m *UsageStatisticMonthMutation) ConsumeCoin() (r float64, exists bool) {
 	v := m.consume_coin
 	if v == nil {
 		return
@@ -42663,7 +42663,7 @@ func (m *UsageStatisticMonthMutation) ConsumeCoin() (r uint64, exists bool) {
 // OldConsumeCoin returns the old "consume_coin" field's value of the UsageStatisticMonth entity.
 // If the UsageStatisticMonth object wasn't provided to the builder, the object is fetched from the database.
 // An error is returned if the mutation operation is not UpdateOne, or the database query fails.
-func (m *UsageStatisticMonthMutation) OldConsumeCoin(ctx context.Context) (v uint64, err error) {
+func (m *UsageStatisticMonthMutation) OldConsumeCoin(ctx context.Context) (v float64, err error) {
 	if !m.op.Is(OpUpdateOne) {
 		return v, errors.New("OldConsumeCoin is only allowed on UpdateOne operations")
 	}
@@ -42677,17 +42677,17 @@ func (m *UsageStatisticMonthMutation) OldConsumeCoin(ctx context.Context) (v uin
 	return oldValue.ConsumeCoin, nil
 }
 
-// AddConsumeCoin adds u to the "consume_coin" field.
-func (m *UsageStatisticMonthMutation) AddConsumeCoin(u int64) {
+// AddConsumeCoin adds f to the "consume_coin" field.
+func (m *UsageStatisticMonthMutation) AddConsumeCoin(f float64) {
 	if m.addconsume_coin != nil {
-		*m.addconsume_coin += u
+		*m.addconsume_coin += f
 	} else {
-		m.addconsume_coin = &u
+		m.addconsume_coin = &f
 	}
 }
 
 // AddedConsumeCoin returns the value that was added to the "consume_coin" field in this mutation.
-func (m *UsageStatisticMonthMutation) AddedConsumeCoin() (r int64, exists bool) {
+func (m *UsageStatisticMonthMutation) AddedConsumeCoin() (r float64, exists bool) {
 	v := m.addconsume_coin
 	if v == nil {
 		return
@@ -43022,7 +43022,7 @@ func (m *UsageStatisticMonthMutation) SetField(name string, value ent.Value) err
 		m.SetLabelDist(v)
 		return nil
 	case usagestatisticmonth.FieldConsumeCoin:
-		v, ok := value.(uint64)
+		v, ok := value.(float64)
 		if !ok {
 			return fmt.Errorf("unexpected type %T for field %s", value, name)
 		}
@@ -43203,7 +43203,7 @@ func (m *UsageStatisticMonthMutation) AddField(name string, value ent.Value) err
 		m.AddNewUser(v)
 		return nil
 	case usagestatisticmonth.FieldConsumeCoin:
-		v, ok := value.(int64)
+		v, ok := value.(float64)
 		if !ok {
 			return fmt.Errorf("unexpected type %T for field %s", value, name)
 		}

+ 3 - 3
ent/runtime/runtime.go

@@ -1468,7 +1468,7 @@ func init() {
 	// usagestatisticdayDescConsumeCoin is the schema descriptor for consume_coin field.
 	usagestatisticdayDescConsumeCoin := usagestatisticdayFields[13].Descriptor()
 	// usagestatisticday.DefaultConsumeCoin holds the default value on creation for the consume_coin field.
-	usagestatisticday.DefaultConsumeCoin = usagestatisticdayDescConsumeCoin.Default.(uint64)
+	usagestatisticday.DefaultConsumeCoin = usagestatisticdayDescConsumeCoin.Default.(float64)
 	usagestatistichourMixin := schema.UsageStatisticHour{}.Mixin()
 	usagestatistichourMixinHooks2 := usagestatistichourMixin[2].Hooks()
 	usagestatistichour.Hooks[0] = usagestatistichourMixinHooks2[0]
@@ -1497,7 +1497,7 @@ func init() {
 	// usagestatistichourDescConsumeCoin is the schema descriptor for consume_coin field.
 	usagestatistichourDescConsumeCoin := usagestatistichourFields[13].Descriptor()
 	// usagestatistichour.DefaultConsumeCoin holds the default value on creation for the consume_coin field.
-	usagestatistichour.DefaultConsumeCoin = usagestatistichourDescConsumeCoin.Default.(uint64)
+	usagestatistichour.DefaultConsumeCoin = usagestatistichourDescConsumeCoin.Default.(float64)
 	usagestatisticmonthMixin := schema.UsageStatisticMonth{}.Mixin()
 	usagestatisticmonthMixinHooks2 := usagestatisticmonthMixin[2].Hooks()
 	usagestatisticmonth.Hooks[0] = usagestatisticmonthMixinHooks2[0]
@@ -1526,7 +1526,7 @@ func init() {
 	// usagestatisticmonthDescConsumeCoin is the schema descriptor for consume_coin field.
 	usagestatisticmonthDescConsumeCoin := usagestatisticmonthFields[13].Descriptor()
 	// usagestatisticmonth.DefaultConsumeCoin holds the default value on creation for the consume_coin field.
-	usagestatisticmonth.DefaultConsumeCoin = usagestatisticmonthDescConsumeCoin.Default.(uint64)
+	usagestatisticmonth.DefaultConsumeCoin = usagestatisticmonthDescConsumeCoin.Default.(float64)
 	usagetotalMixin := schema.UsageTotal{}.Mixin()
 	usagetotalMixinFields0 := usagetotalMixin[0].Fields()
 	_ = usagetotalMixinFields0

+ 1 - 1
ent/schema/usage_statistic_day.go

@@ -33,7 +33,7 @@ func (UsageStatisticDay) Fields() []ent.Field {
 		field.JSON("label_dist", []custom_types.LabelDist{}).
 			Annotations(entsql.WithComments(true)).
 			Comment("标签分布"),
-		field.Uint64("consume_coin").Optional().Default(0).Comment("消耗积分"),
+		field.Float("consume_coin").Optional().Default(0).Comment("消耗积分"),
 	}
 }
 

+ 1 - 1
ent/schema/usage_statistic_hour.go

@@ -33,7 +33,7 @@ func (UsageStatisticHour) Fields() []ent.Field {
 		field.JSON("label_dist", []custom_types.LabelDist{}).
 			Annotations(entsql.WithComments(true)).
 			Comment("标签分布"),
-		field.Uint64("consume_coin").Optional().Default(0).Comment("消耗积分"),
+		field.Float("consume_coin").Optional().Default(0).Comment("消耗积分"),
 	}
 }
 

+ 1 - 1
ent/schema/usage_statistic_month.go

@@ -33,7 +33,7 @@ func (UsageStatisticMonth) Fields() []ent.Field {
 		field.JSON("label_dist", []custom_types.LabelDist{}).
 			Annotations(entsql.WithComments(true)).
 			Comment("标签分布"),
-		field.Uint64("consume_coin").Optional().Default(0).Comment("消耗积分"),
+		field.Float("consume_coin").Optional().Default(0).Comment("消耗积分"),
 	}
 }
 

+ 9 - 9
ent/set_not_nil.go

@@ -8480,7 +8480,7 @@ func (usd *UsageStatisticDayCreate) SetNotNilLabelDist(value []custom_types.Labe
 }
 
 // set field if value's pointer is not nil.
-func (usd *UsageStatisticDayUpdate) SetNotNilConsumeCoin(value *uint64) *UsageStatisticDayUpdate {
+func (usd *UsageStatisticDayUpdate) SetNotNilConsumeCoin(value *float64) *UsageStatisticDayUpdate {
 	if value != nil {
 		return usd.SetConsumeCoin(*value)
 	}
@@ -8488,7 +8488,7 @@ func (usd *UsageStatisticDayUpdate) SetNotNilConsumeCoin(value *uint64) *UsageSt
 }
 
 // set field if value's pointer is not nil.
-func (usd *UsageStatisticDayUpdateOne) SetNotNilConsumeCoin(value *uint64) *UsageStatisticDayUpdateOne {
+func (usd *UsageStatisticDayUpdateOne) SetNotNilConsumeCoin(value *float64) *UsageStatisticDayUpdateOne {
 	if value != nil {
 		return usd.SetConsumeCoin(*value)
 	}
@@ -8496,7 +8496,7 @@ func (usd *UsageStatisticDayUpdateOne) SetNotNilConsumeCoin(value *uint64) *Usag
 }
 
 // set field if value's pointer is not nil.
-func (usd *UsageStatisticDayCreate) SetNotNilConsumeCoin(value *uint64) *UsageStatisticDayCreate {
+func (usd *UsageStatisticDayCreate) SetNotNilConsumeCoin(value *float64) *UsageStatisticDayCreate {
 	if value != nil {
 		return usd.SetConsumeCoin(*value)
 	}
@@ -8888,7 +8888,7 @@ func (ush *UsageStatisticHourCreate) SetNotNilLabelDist(value []custom_types.Lab
 }
 
 // set field if value's pointer is not nil.
-func (ush *UsageStatisticHourUpdate) SetNotNilConsumeCoin(value *uint64) *UsageStatisticHourUpdate {
+func (ush *UsageStatisticHourUpdate) SetNotNilConsumeCoin(value *float64) *UsageStatisticHourUpdate {
 	if value != nil {
 		return ush.SetConsumeCoin(*value)
 	}
@@ -8896,7 +8896,7 @@ func (ush *UsageStatisticHourUpdate) SetNotNilConsumeCoin(value *uint64) *UsageS
 }
 
 // set field if value's pointer is not nil.
-func (ush *UsageStatisticHourUpdateOne) SetNotNilConsumeCoin(value *uint64) *UsageStatisticHourUpdateOne {
+func (ush *UsageStatisticHourUpdateOne) SetNotNilConsumeCoin(value *float64) *UsageStatisticHourUpdateOne {
 	if value != nil {
 		return ush.SetConsumeCoin(*value)
 	}
@@ -8904,7 +8904,7 @@ func (ush *UsageStatisticHourUpdateOne) SetNotNilConsumeCoin(value *uint64) *Usa
 }
 
 // set field if value's pointer is not nil.
-func (ush *UsageStatisticHourCreate) SetNotNilConsumeCoin(value *uint64) *UsageStatisticHourCreate {
+func (ush *UsageStatisticHourCreate) SetNotNilConsumeCoin(value *float64) *UsageStatisticHourCreate {
 	if value != nil {
 		return ush.SetConsumeCoin(*value)
 	}
@@ -9296,7 +9296,7 @@ func (usm *UsageStatisticMonthCreate) SetNotNilLabelDist(value []custom_types.La
 }
 
 // set field if value's pointer is not nil.
-func (usm *UsageStatisticMonthUpdate) SetNotNilConsumeCoin(value *uint64) *UsageStatisticMonthUpdate {
+func (usm *UsageStatisticMonthUpdate) SetNotNilConsumeCoin(value *float64) *UsageStatisticMonthUpdate {
 	if value != nil {
 		return usm.SetConsumeCoin(*value)
 	}
@@ -9304,7 +9304,7 @@ func (usm *UsageStatisticMonthUpdate) SetNotNilConsumeCoin(value *uint64) *Usage
 }
 
 // set field if value's pointer is not nil.
-func (usm *UsageStatisticMonthUpdateOne) SetNotNilConsumeCoin(value *uint64) *UsageStatisticMonthUpdateOne {
+func (usm *UsageStatisticMonthUpdateOne) SetNotNilConsumeCoin(value *float64) *UsageStatisticMonthUpdateOne {
 	if value != nil {
 		return usm.SetConsumeCoin(*value)
 	}
@@ -9312,7 +9312,7 @@ func (usm *UsageStatisticMonthUpdateOne) SetNotNilConsumeCoin(value *uint64) *Us
 }
 
 // set field if value's pointer is not nil.
-func (usm *UsageStatisticMonthCreate) SetNotNilConsumeCoin(value *uint64) *UsageStatisticMonthCreate {
+func (usm *UsageStatisticMonthCreate) SetNotNilConsumeCoin(value *float64) *UsageStatisticMonthCreate {
 	if value != nil {
 		return usm.SetConsumeCoin(*value)
 	}

+ 6 - 4
ent/usagestatisticday.go

@@ -54,7 +54,7 @@ type UsageStatisticDay struct {
 	// 标签分布
 	LabelDist []custom_types.LabelDist `json:"label_dist,omitempty"`
 	// 消耗积分
-	ConsumeCoin  uint64 `json:"consume_coin,omitempty"`
+	ConsumeCoin  float64 `json:"consume_coin,omitempty"`
 	selectValues sql.SelectValues
 }
 
@@ -65,7 +65,9 @@ func (*UsageStatisticDay) scanValues(columns []string) ([]any, error) {
 		switch columns[i] {
 		case usagestatisticday.FieldLabelDist:
 			values[i] = new([]byte)
-		case usagestatisticday.FieldID, usagestatisticday.FieldStatus, usagestatisticday.FieldAddtime, usagestatisticday.FieldType, usagestatisticday.FieldOrganizationID, usagestatisticday.FieldAiResponse, usagestatisticday.FieldSopRun, usagestatisticday.FieldTotalFriend, usagestatisticday.FieldTotalGroup, usagestatisticday.FieldAccountBalance, usagestatisticday.FieldConsumeToken, usagestatisticday.FieldActiveUser, usagestatisticday.FieldNewUser, usagestatisticday.FieldConsumeCoin:
+		case usagestatisticday.FieldConsumeCoin:
+			values[i] = new(sql.NullFloat64)
+		case usagestatisticday.FieldID, usagestatisticday.FieldStatus, usagestatisticday.FieldAddtime, usagestatisticday.FieldType, usagestatisticday.FieldOrganizationID, usagestatisticday.FieldAiResponse, usagestatisticday.FieldSopRun, usagestatisticday.FieldTotalFriend, usagestatisticday.FieldTotalGroup, usagestatisticday.FieldAccountBalance, usagestatisticday.FieldConsumeToken, usagestatisticday.FieldActiveUser, usagestatisticday.FieldNewUser:
 			values[i] = new(sql.NullInt64)
 		case usagestatisticday.FieldBotID:
 			values[i] = new(sql.NullString)
@@ -197,10 +199,10 @@ func (usd *UsageStatisticDay) assignValues(columns []string, values []any) error
 				}
 			}
 		case usagestatisticday.FieldConsumeCoin:
-			if value, ok := values[i].(*sql.NullInt64); !ok {
+			if value, ok := values[i].(*sql.NullFloat64); !ok {
 				return fmt.Errorf("unexpected type %T for field consume_coin", values[i])
 			} else if value.Valid {
-				usd.ConsumeCoin = uint64(value.Int64)
+				usd.ConsumeCoin = value.Float64
 			}
 		default:
 			usd.selectValues.Set(columns[i], values[i])

+ 1 - 1
ent/usagestatisticday/usagestatisticday.go

@@ -104,7 +104,7 @@ var (
 	// DefaultStatus holds the default value on creation for the "status" field.
 	DefaultStatus uint8
 	// DefaultConsumeCoin holds the default value on creation for the "consume_coin" field.
-	DefaultConsumeCoin uint64
+	DefaultConsumeCoin float64
 )
 
 // OrderOption defines the ordering options for the UsageStatisticDay queries.

+ 9 - 9
ent/usagestatisticday/where.go

@@ -135,7 +135,7 @@ func NewUser(v int64) predicate.UsageStatisticDay {
 }
 
 // ConsumeCoin applies equality check predicate on the "consume_coin" field. It's identical to ConsumeCoinEQ.
-func ConsumeCoin(v uint64) predicate.UsageStatisticDay {
+func ConsumeCoin(v float64) predicate.UsageStatisticDay {
 	return predicate.UsageStatisticDay(sql.FieldEQ(FieldConsumeCoin, v))
 }
 
@@ -845,42 +845,42 @@ func NewUserLTE(v int64) predicate.UsageStatisticDay {
 }
 
 // ConsumeCoinEQ applies the EQ predicate on the "consume_coin" field.
-func ConsumeCoinEQ(v uint64) predicate.UsageStatisticDay {
+func ConsumeCoinEQ(v float64) predicate.UsageStatisticDay {
 	return predicate.UsageStatisticDay(sql.FieldEQ(FieldConsumeCoin, v))
 }
 
 // ConsumeCoinNEQ applies the NEQ predicate on the "consume_coin" field.
-func ConsumeCoinNEQ(v uint64) predicate.UsageStatisticDay {
+func ConsumeCoinNEQ(v float64) predicate.UsageStatisticDay {
 	return predicate.UsageStatisticDay(sql.FieldNEQ(FieldConsumeCoin, v))
 }
 
 // ConsumeCoinIn applies the In predicate on the "consume_coin" field.
-func ConsumeCoinIn(vs ...uint64) predicate.UsageStatisticDay {
+func ConsumeCoinIn(vs ...float64) predicate.UsageStatisticDay {
 	return predicate.UsageStatisticDay(sql.FieldIn(FieldConsumeCoin, vs...))
 }
 
 // ConsumeCoinNotIn applies the NotIn predicate on the "consume_coin" field.
-func ConsumeCoinNotIn(vs ...uint64) predicate.UsageStatisticDay {
+func ConsumeCoinNotIn(vs ...float64) predicate.UsageStatisticDay {
 	return predicate.UsageStatisticDay(sql.FieldNotIn(FieldConsumeCoin, vs...))
 }
 
 // ConsumeCoinGT applies the GT predicate on the "consume_coin" field.
-func ConsumeCoinGT(v uint64) predicate.UsageStatisticDay {
+func ConsumeCoinGT(v float64) predicate.UsageStatisticDay {
 	return predicate.UsageStatisticDay(sql.FieldGT(FieldConsumeCoin, v))
 }
 
 // ConsumeCoinGTE applies the GTE predicate on the "consume_coin" field.
-func ConsumeCoinGTE(v uint64) predicate.UsageStatisticDay {
+func ConsumeCoinGTE(v float64) predicate.UsageStatisticDay {
 	return predicate.UsageStatisticDay(sql.FieldGTE(FieldConsumeCoin, v))
 }
 
 // ConsumeCoinLT applies the LT predicate on the "consume_coin" field.
-func ConsumeCoinLT(v uint64) predicate.UsageStatisticDay {
+func ConsumeCoinLT(v float64) predicate.UsageStatisticDay {
 	return predicate.UsageStatisticDay(sql.FieldLT(FieldConsumeCoin, v))
 }
 
 // ConsumeCoinLTE applies the LTE predicate on the "consume_coin" field.
-func ConsumeCoinLTE(v uint64) predicate.UsageStatisticDay {
+func ConsumeCoinLTE(v float64) predicate.UsageStatisticDay {
 	return predicate.UsageStatisticDay(sql.FieldLTE(FieldConsumeCoin, v))
 }
 

+ 12 - 12
ent/usagestatisticday_create.go

@@ -174,15 +174,15 @@ func (usdc *UsageStatisticDayCreate) SetLabelDist(ctd []custom_types.LabelDist)
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (usdc *UsageStatisticDayCreate) SetConsumeCoin(u uint64) *UsageStatisticDayCreate {
-	usdc.mutation.SetConsumeCoin(u)
+func (usdc *UsageStatisticDayCreate) SetConsumeCoin(f float64) *UsageStatisticDayCreate {
+	usdc.mutation.SetConsumeCoin(f)
 	return usdc
 }
 
 // SetNillableConsumeCoin sets the "consume_coin" field if the given value is not nil.
-func (usdc *UsageStatisticDayCreate) SetNillableConsumeCoin(u *uint64) *UsageStatisticDayCreate {
-	if u != nil {
-		usdc.SetConsumeCoin(*u)
+func (usdc *UsageStatisticDayCreate) SetNillableConsumeCoin(f *float64) *UsageStatisticDayCreate {
+	if f != nil {
+		usdc.SetConsumeCoin(*f)
 	}
 	return usdc
 }
@@ -398,7 +398,7 @@ func (usdc *UsageStatisticDayCreate) createSpec() (*UsageStatisticDay, *sqlgraph
 		_node.LabelDist = value
 	}
 	if value, ok := usdc.mutation.ConsumeCoin(); ok {
-		_spec.SetField(usagestatisticday.FieldConsumeCoin, field.TypeUint64, value)
+		_spec.SetField(usagestatisticday.FieldConsumeCoin, field.TypeFloat64, value)
 		_node.ConsumeCoin = value
 	}
 	return _node, _spec
@@ -742,7 +742,7 @@ func (u *UsageStatisticDayUpsert) UpdateLabelDist() *UsageStatisticDayUpsert {
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (u *UsageStatisticDayUpsert) SetConsumeCoin(v uint64) *UsageStatisticDayUpsert {
+func (u *UsageStatisticDayUpsert) SetConsumeCoin(v float64) *UsageStatisticDayUpsert {
 	u.Set(usagestatisticday.FieldConsumeCoin, v)
 	return u
 }
@@ -754,7 +754,7 @@ func (u *UsageStatisticDayUpsert) UpdateConsumeCoin() *UsageStatisticDayUpsert {
 }
 
 // AddConsumeCoin adds v to the "consume_coin" field.
-func (u *UsageStatisticDayUpsert) AddConsumeCoin(v uint64) *UsageStatisticDayUpsert {
+func (u *UsageStatisticDayUpsert) AddConsumeCoin(v float64) *UsageStatisticDayUpsert {
 	u.Add(usagestatisticday.FieldConsumeCoin, v)
 	return u
 }
@@ -1153,14 +1153,14 @@ func (u *UsageStatisticDayUpsertOne) UpdateLabelDist() *UsageStatisticDayUpsertO
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (u *UsageStatisticDayUpsertOne) SetConsumeCoin(v uint64) *UsageStatisticDayUpsertOne {
+func (u *UsageStatisticDayUpsertOne) SetConsumeCoin(v float64) *UsageStatisticDayUpsertOne {
 	return u.Update(func(s *UsageStatisticDayUpsert) {
 		s.SetConsumeCoin(v)
 	})
 }
 
 // AddConsumeCoin adds v to the "consume_coin" field.
-func (u *UsageStatisticDayUpsertOne) AddConsumeCoin(v uint64) *UsageStatisticDayUpsertOne {
+func (u *UsageStatisticDayUpsertOne) AddConsumeCoin(v float64) *UsageStatisticDayUpsertOne {
 	return u.Update(func(s *UsageStatisticDayUpsert) {
 		s.AddConsumeCoin(v)
 	})
@@ -1734,14 +1734,14 @@ func (u *UsageStatisticDayUpsertBulk) UpdateLabelDist() *UsageStatisticDayUpsert
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (u *UsageStatisticDayUpsertBulk) SetConsumeCoin(v uint64) *UsageStatisticDayUpsertBulk {
+func (u *UsageStatisticDayUpsertBulk) SetConsumeCoin(v float64) *UsageStatisticDayUpsertBulk {
 	return u.Update(func(s *UsageStatisticDayUpsert) {
 		s.SetConsumeCoin(v)
 	})
 }
 
 // AddConsumeCoin adds v to the "consume_coin" field.
-func (u *UsageStatisticDayUpsertBulk) AddConsumeCoin(v uint64) *UsageStatisticDayUpsertBulk {
+func (u *UsageStatisticDayUpsertBulk) AddConsumeCoin(v float64) *UsageStatisticDayUpsertBulk {
 	return u.Update(func(s *UsageStatisticDayUpsert) {
 		s.AddConsumeCoin(v)
 	})

+ 22 - 22
ent/usagestatisticday_update.go

@@ -353,23 +353,23 @@ func (usdu *UsageStatisticDayUpdate) AppendLabelDist(ctd []custom_types.LabelDis
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (usdu *UsageStatisticDayUpdate) SetConsumeCoin(u uint64) *UsageStatisticDayUpdate {
+func (usdu *UsageStatisticDayUpdate) SetConsumeCoin(f float64) *UsageStatisticDayUpdate {
 	usdu.mutation.ResetConsumeCoin()
-	usdu.mutation.SetConsumeCoin(u)
+	usdu.mutation.SetConsumeCoin(f)
 	return usdu
 }
 
 // SetNillableConsumeCoin sets the "consume_coin" field if the given value is not nil.
-func (usdu *UsageStatisticDayUpdate) SetNillableConsumeCoin(u *uint64) *UsageStatisticDayUpdate {
-	if u != nil {
-		usdu.SetConsumeCoin(*u)
+func (usdu *UsageStatisticDayUpdate) SetNillableConsumeCoin(f *float64) *UsageStatisticDayUpdate {
+	if f != nil {
+		usdu.SetConsumeCoin(*f)
 	}
 	return usdu
 }
 
-// AddConsumeCoin adds u to the "consume_coin" field.
-func (usdu *UsageStatisticDayUpdate) AddConsumeCoin(u int64) *UsageStatisticDayUpdate {
-	usdu.mutation.AddConsumeCoin(u)
+// AddConsumeCoin adds f to the "consume_coin" field.
+func (usdu *UsageStatisticDayUpdate) AddConsumeCoin(f float64) *UsageStatisticDayUpdate {
+	usdu.mutation.AddConsumeCoin(f)
 	return usdu
 }
 
@@ -537,13 +537,13 @@ func (usdu *UsageStatisticDayUpdate) sqlSave(ctx context.Context) (n int, err er
 		})
 	}
 	if value, ok := usdu.mutation.ConsumeCoin(); ok {
-		_spec.SetField(usagestatisticday.FieldConsumeCoin, field.TypeUint64, value)
+		_spec.SetField(usagestatisticday.FieldConsumeCoin, field.TypeFloat64, value)
 	}
 	if value, ok := usdu.mutation.AddedConsumeCoin(); ok {
-		_spec.AddField(usagestatisticday.FieldConsumeCoin, field.TypeUint64, value)
+		_spec.AddField(usagestatisticday.FieldConsumeCoin, field.TypeFloat64, value)
 	}
 	if usdu.mutation.ConsumeCoinCleared() {
-		_spec.ClearField(usagestatisticday.FieldConsumeCoin, field.TypeUint64)
+		_spec.ClearField(usagestatisticday.FieldConsumeCoin, field.TypeFloat64)
 	}
 	if n, err = sqlgraph.UpdateNodes(ctx, usdu.driver, _spec); err != nil {
 		if _, ok := err.(*sqlgraph.NotFoundError); ok {
@@ -888,23 +888,23 @@ func (usduo *UsageStatisticDayUpdateOne) AppendLabelDist(ctd []custom_types.Labe
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (usduo *UsageStatisticDayUpdateOne) SetConsumeCoin(u uint64) *UsageStatisticDayUpdateOne {
+func (usduo *UsageStatisticDayUpdateOne) SetConsumeCoin(f float64) *UsageStatisticDayUpdateOne {
 	usduo.mutation.ResetConsumeCoin()
-	usduo.mutation.SetConsumeCoin(u)
+	usduo.mutation.SetConsumeCoin(f)
 	return usduo
 }
 
 // SetNillableConsumeCoin sets the "consume_coin" field if the given value is not nil.
-func (usduo *UsageStatisticDayUpdateOne) SetNillableConsumeCoin(u *uint64) *UsageStatisticDayUpdateOne {
-	if u != nil {
-		usduo.SetConsumeCoin(*u)
+func (usduo *UsageStatisticDayUpdateOne) SetNillableConsumeCoin(f *float64) *UsageStatisticDayUpdateOne {
+	if f != nil {
+		usduo.SetConsumeCoin(*f)
 	}
 	return usduo
 }
 
-// AddConsumeCoin adds u to the "consume_coin" field.
-func (usduo *UsageStatisticDayUpdateOne) AddConsumeCoin(u int64) *UsageStatisticDayUpdateOne {
-	usduo.mutation.AddConsumeCoin(u)
+// AddConsumeCoin adds f to the "consume_coin" field.
+func (usduo *UsageStatisticDayUpdateOne) AddConsumeCoin(f float64) *UsageStatisticDayUpdateOne {
+	usduo.mutation.AddConsumeCoin(f)
 	return usduo
 }
 
@@ -1102,13 +1102,13 @@ func (usduo *UsageStatisticDayUpdateOne) sqlSave(ctx context.Context) (_node *Us
 		})
 	}
 	if value, ok := usduo.mutation.ConsumeCoin(); ok {
-		_spec.SetField(usagestatisticday.FieldConsumeCoin, field.TypeUint64, value)
+		_spec.SetField(usagestatisticday.FieldConsumeCoin, field.TypeFloat64, value)
 	}
 	if value, ok := usduo.mutation.AddedConsumeCoin(); ok {
-		_spec.AddField(usagestatisticday.FieldConsumeCoin, field.TypeUint64, value)
+		_spec.AddField(usagestatisticday.FieldConsumeCoin, field.TypeFloat64, value)
 	}
 	if usduo.mutation.ConsumeCoinCleared() {
-		_spec.ClearField(usagestatisticday.FieldConsumeCoin, field.TypeUint64)
+		_spec.ClearField(usagestatisticday.FieldConsumeCoin, field.TypeFloat64)
 	}
 	_node = &UsageStatisticDay{config: usduo.config}
 	_spec.Assign = _node.assignValues

+ 6 - 4
ent/usagestatistichour.go

@@ -54,7 +54,7 @@ type UsageStatisticHour struct {
 	// 标签分布
 	LabelDist []custom_types.LabelDist `json:"label_dist,omitempty"`
 	// 消耗积分
-	ConsumeCoin  uint64 `json:"consume_coin,omitempty"`
+	ConsumeCoin  float64 `json:"consume_coin,omitempty"`
 	selectValues sql.SelectValues
 }
 
@@ -65,7 +65,9 @@ func (*UsageStatisticHour) scanValues(columns []string) ([]any, error) {
 		switch columns[i] {
 		case usagestatistichour.FieldLabelDist:
 			values[i] = new([]byte)
-		case usagestatistichour.FieldID, usagestatistichour.FieldStatus, usagestatistichour.FieldAddtime, usagestatistichour.FieldType, usagestatistichour.FieldOrganizationID, usagestatistichour.FieldAiResponse, usagestatistichour.FieldSopRun, usagestatistichour.FieldTotalFriend, usagestatistichour.FieldTotalGroup, usagestatistichour.FieldAccountBalance, usagestatistichour.FieldConsumeToken, usagestatistichour.FieldActiveUser, usagestatistichour.FieldNewUser, usagestatistichour.FieldConsumeCoin:
+		case usagestatistichour.FieldConsumeCoin:
+			values[i] = new(sql.NullFloat64)
+		case usagestatistichour.FieldID, usagestatistichour.FieldStatus, usagestatistichour.FieldAddtime, usagestatistichour.FieldType, usagestatistichour.FieldOrganizationID, usagestatistichour.FieldAiResponse, usagestatistichour.FieldSopRun, usagestatistichour.FieldTotalFriend, usagestatistichour.FieldTotalGroup, usagestatistichour.FieldAccountBalance, usagestatistichour.FieldConsumeToken, usagestatistichour.FieldActiveUser, usagestatistichour.FieldNewUser:
 			values[i] = new(sql.NullInt64)
 		case usagestatistichour.FieldBotID:
 			values[i] = new(sql.NullString)
@@ -197,10 +199,10 @@ func (ush *UsageStatisticHour) assignValues(columns []string, values []any) erro
 				}
 			}
 		case usagestatistichour.FieldConsumeCoin:
-			if value, ok := values[i].(*sql.NullInt64); !ok {
+			if value, ok := values[i].(*sql.NullFloat64); !ok {
 				return fmt.Errorf("unexpected type %T for field consume_coin", values[i])
 			} else if value.Valid {
-				ush.ConsumeCoin = uint64(value.Int64)
+				ush.ConsumeCoin = value.Float64
 			}
 		default:
 			ush.selectValues.Set(columns[i], values[i])

+ 1 - 1
ent/usagestatistichour/usagestatistichour.go

@@ -104,7 +104,7 @@ var (
 	// DefaultStatus holds the default value on creation for the "status" field.
 	DefaultStatus uint8
 	// DefaultConsumeCoin holds the default value on creation for the "consume_coin" field.
-	DefaultConsumeCoin uint64
+	DefaultConsumeCoin float64
 )
 
 // OrderOption defines the ordering options for the UsageStatisticHour queries.

+ 9 - 9
ent/usagestatistichour/where.go

@@ -135,7 +135,7 @@ func NewUser(v int64) predicate.UsageStatisticHour {
 }
 
 // ConsumeCoin applies equality check predicate on the "consume_coin" field. It's identical to ConsumeCoinEQ.
-func ConsumeCoin(v uint64) predicate.UsageStatisticHour {
+func ConsumeCoin(v float64) predicate.UsageStatisticHour {
 	return predicate.UsageStatisticHour(sql.FieldEQ(FieldConsumeCoin, v))
 }
 
@@ -845,42 +845,42 @@ func NewUserLTE(v int64) predicate.UsageStatisticHour {
 }
 
 // ConsumeCoinEQ applies the EQ predicate on the "consume_coin" field.
-func ConsumeCoinEQ(v uint64) predicate.UsageStatisticHour {
+func ConsumeCoinEQ(v float64) predicate.UsageStatisticHour {
 	return predicate.UsageStatisticHour(sql.FieldEQ(FieldConsumeCoin, v))
 }
 
 // ConsumeCoinNEQ applies the NEQ predicate on the "consume_coin" field.
-func ConsumeCoinNEQ(v uint64) predicate.UsageStatisticHour {
+func ConsumeCoinNEQ(v float64) predicate.UsageStatisticHour {
 	return predicate.UsageStatisticHour(sql.FieldNEQ(FieldConsumeCoin, v))
 }
 
 // ConsumeCoinIn applies the In predicate on the "consume_coin" field.
-func ConsumeCoinIn(vs ...uint64) predicate.UsageStatisticHour {
+func ConsumeCoinIn(vs ...float64) predicate.UsageStatisticHour {
 	return predicate.UsageStatisticHour(sql.FieldIn(FieldConsumeCoin, vs...))
 }
 
 // ConsumeCoinNotIn applies the NotIn predicate on the "consume_coin" field.
-func ConsumeCoinNotIn(vs ...uint64) predicate.UsageStatisticHour {
+func ConsumeCoinNotIn(vs ...float64) predicate.UsageStatisticHour {
 	return predicate.UsageStatisticHour(sql.FieldNotIn(FieldConsumeCoin, vs...))
 }
 
 // ConsumeCoinGT applies the GT predicate on the "consume_coin" field.
-func ConsumeCoinGT(v uint64) predicate.UsageStatisticHour {
+func ConsumeCoinGT(v float64) predicate.UsageStatisticHour {
 	return predicate.UsageStatisticHour(sql.FieldGT(FieldConsumeCoin, v))
 }
 
 // ConsumeCoinGTE applies the GTE predicate on the "consume_coin" field.
-func ConsumeCoinGTE(v uint64) predicate.UsageStatisticHour {
+func ConsumeCoinGTE(v float64) predicate.UsageStatisticHour {
 	return predicate.UsageStatisticHour(sql.FieldGTE(FieldConsumeCoin, v))
 }
 
 // ConsumeCoinLT applies the LT predicate on the "consume_coin" field.
-func ConsumeCoinLT(v uint64) predicate.UsageStatisticHour {
+func ConsumeCoinLT(v float64) predicate.UsageStatisticHour {
 	return predicate.UsageStatisticHour(sql.FieldLT(FieldConsumeCoin, v))
 }
 
 // ConsumeCoinLTE applies the LTE predicate on the "consume_coin" field.
-func ConsumeCoinLTE(v uint64) predicate.UsageStatisticHour {
+func ConsumeCoinLTE(v float64) predicate.UsageStatisticHour {
 	return predicate.UsageStatisticHour(sql.FieldLTE(FieldConsumeCoin, v))
 }
 

+ 12 - 12
ent/usagestatistichour_create.go

@@ -174,15 +174,15 @@ func (ushc *UsageStatisticHourCreate) SetLabelDist(ctd []custom_types.LabelDist)
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (ushc *UsageStatisticHourCreate) SetConsumeCoin(u uint64) *UsageStatisticHourCreate {
-	ushc.mutation.SetConsumeCoin(u)
+func (ushc *UsageStatisticHourCreate) SetConsumeCoin(f float64) *UsageStatisticHourCreate {
+	ushc.mutation.SetConsumeCoin(f)
 	return ushc
 }
 
 // SetNillableConsumeCoin sets the "consume_coin" field if the given value is not nil.
-func (ushc *UsageStatisticHourCreate) SetNillableConsumeCoin(u *uint64) *UsageStatisticHourCreate {
-	if u != nil {
-		ushc.SetConsumeCoin(*u)
+func (ushc *UsageStatisticHourCreate) SetNillableConsumeCoin(f *float64) *UsageStatisticHourCreate {
+	if f != nil {
+		ushc.SetConsumeCoin(*f)
 	}
 	return ushc
 }
@@ -398,7 +398,7 @@ func (ushc *UsageStatisticHourCreate) createSpec() (*UsageStatisticHour, *sqlgra
 		_node.LabelDist = value
 	}
 	if value, ok := ushc.mutation.ConsumeCoin(); ok {
-		_spec.SetField(usagestatistichour.FieldConsumeCoin, field.TypeUint64, value)
+		_spec.SetField(usagestatistichour.FieldConsumeCoin, field.TypeFloat64, value)
 		_node.ConsumeCoin = value
 	}
 	return _node, _spec
@@ -742,7 +742,7 @@ func (u *UsageStatisticHourUpsert) UpdateLabelDist() *UsageStatisticHourUpsert {
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (u *UsageStatisticHourUpsert) SetConsumeCoin(v uint64) *UsageStatisticHourUpsert {
+func (u *UsageStatisticHourUpsert) SetConsumeCoin(v float64) *UsageStatisticHourUpsert {
 	u.Set(usagestatistichour.FieldConsumeCoin, v)
 	return u
 }
@@ -754,7 +754,7 @@ func (u *UsageStatisticHourUpsert) UpdateConsumeCoin() *UsageStatisticHourUpsert
 }
 
 // AddConsumeCoin adds v to the "consume_coin" field.
-func (u *UsageStatisticHourUpsert) AddConsumeCoin(v uint64) *UsageStatisticHourUpsert {
+func (u *UsageStatisticHourUpsert) AddConsumeCoin(v float64) *UsageStatisticHourUpsert {
 	u.Add(usagestatistichour.FieldConsumeCoin, v)
 	return u
 }
@@ -1153,14 +1153,14 @@ func (u *UsageStatisticHourUpsertOne) UpdateLabelDist() *UsageStatisticHourUpser
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (u *UsageStatisticHourUpsertOne) SetConsumeCoin(v uint64) *UsageStatisticHourUpsertOne {
+func (u *UsageStatisticHourUpsertOne) SetConsumeCoin(v float64) *UsageStatisticHourUpsertOne {
 	return u.Update(func(s *UsageStatisticHourUpsert) {
 		s.SetConsumeCoin(v)
 	})
 }
 
 // AddConsumeCoin adds v to the "consume_coin" field.
-func (u *UsageStatisticHourUpsertOne) AddConsumeCoin(v uint64) *UsageStatisticHourUpsertOne {
+func (u *UsageStatisticHourUpsertOne) AddConsumeCoin(v float64) *UsageStatisticHourUpsertOne {
 	return u.Update(func(s *UsageStatisticHourUpsert) {
 		s.AddConsumeCoin(v)
 	})
@@ -1734,14 +1734,14 @@ func (u *UsageStatisticHourUpsertBulk) UpdateLabelDist() *UsageStatisticHourUpse
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (u *UsageStatisticHourUpsertBulk) SetConsumeCoin(v uint64) *UsageStatisticHourUpsertBulk {
+func (u *UsageStatisticHourUpsertBulk) SetConsumeCoin(v float64) *UsageStatisticHourUpsertBulk {
 	return u.Update(func(s *UsageStatisticHourUpsert) {
 		s.SetConsumeCoin(v)
 	})
 }
 
 // AddConsumeCoin adds v to the "consume_coin" field.
-func (u *UsageStatisticHourUpsertBulk) AddConsumeCoin(v uint64) *UsageStatisticHourUpsertBulk {
+func (u *UsageStatisticHourUpsertBulk) AddConsumeCoin(v float64) *UsageStatisticHourUpsertBulk {
 	return u.Update(func(s *UsageStatisticHourUpsert) {
 		s.AddConsumeCoin(v)
 	})

+ 22 - 22
ent/usagestatistichour_update.go

@@ -353,23 +353,23 @@ func (ushu *UsageStatisticHourUpdate) AppendLabelDist(ctd []custom_types.LabelDi
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (ushu *UsageStatisticHourUpdate) SetConsumeCoin(u uint64) *UsageStatisticHourUpdate {
+func (ushu *UsageStatisticHourUpdate) SetConsumeCoin(f float64) *UsageStatisticHourUpdate {
 	ushu.mutation.ResetConsumeCoin()
-	ushu.mutation.SetConsumeCoin(u)
+	ushu.mutation.SetConsumeCoin(f)
 	return ushu
 }
 
 // SetNillableConsumeCoin sets the "consume_coin" field if the given value is not nil.
-func (ushu *UsageStatisticHourUpdate) SetNillableConsumeCoin(u *uint64) *UsageStatisticHourUpdate {
-	if u != nil {
-		ushu.SetConsumeCoin(*u)
+func (ushu *UsageStatisticHourUpdate) SetNillableConsumeCoin(f *float64) *UsageStatisticHourUpdate {
+	if f != nil {
+		ushu.SetConsumeCoin(*f)
 	}
 	return ushu
 }
 
-// AddConsumeCoin adds u to the "consume_coin" field.
-func (ushu *UsageStatisticHourUpdate) AddConsumeCoin(u int64) *UsageStatisticHourUpdate {
-	ushu.mutation.AddConsumeCoin(u)
+// AddConsumeCoin adds f to the "consume_coin" field.
+func (ushu *UsageStatisticHourUpdate) AddConsumeCoin(f float64) *UsageStatisticHourUpdate {
+	ushu.mutation.AddConsumeCoin(f)
 	return ushu
 }
 
@@ -537,13 +537,13 @@ func (ushu *UsageStatisticHourUpdate) sqlSave(ctx context.Context) (n int, err e
 		})
 	}
 	if value, ok := ushu.mutation.ConsumeCoin(); ok {
-		_spec.SetField(usagestatistichour.FieldConsumeCoin, field.TypeUint64, value)
+		_spec.SetField(usagestatistichour.FieldConsumeCoin, field.TypeFloat64, value)
 	}
 	if value, ok := ushu.mutation.AddedConsumeCoin(); ok {
-		_spec.AddField(usagestatistichour.FieldConsumeCoin, field.TypeUint64, value)
+		_spec.AddField(usagestatistichour.FieldConsumeCoin, field.TypeFloat64, value)
 	}
 	if ushu.mutation.ConsumeCoinCleared() {
-		_spec.ClearField(usagestatistichour.FieldConsumeCoin, field.TypeUint64)
+		_spec.ClearField(usagestatistichour.FieldConsumeCoin, field.TypeFloat64)
 	}
 	if n, err = sqlgraph.UpdateNodes(ctx, ushu.driver, _spec); err != nil {
 		if _, ok := err.(*sqlgraph.NotFoundError); ok {
@@ -888,23 +888,23 @@ func (ushuo *UsageStatisticHourUpdateOne) AppendLabelDist(ctd []custom_types.Lab
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (ushuo *UsageStatisticHourUpdateOne) SetConsumeCoin(u uint64) *UsageStatisticHourUpdateOne {
+func (ushuo *UsageStatisticHourUpdateOne) SetConsumeCoin(f float64) *UsageStatisticHourUpdateOne {
 	ushuo.mutation.ResetConsumeCoin()
-	ushuo.mutation.SetConsumeCoin(u)
+	ushuo.mutation.SetConsumeCoin(f)
 	return ushuo
 }
 
 // SetNillableConsumeCoin sets the "consume_coin" field if the given value is not nil.
-func (ushuo *UsageStatisticHourUpdateOne) SetNillableConsumeCoin(u *uint64) *UsageStatisticHourUpdateOne {
-	if u != nil {
-		ushuo.SetConsumeCoin(*u)
+func (ushuo *UsageStatisticHourUpdateOne) SetNillableConsumeCoin(f *float64) *UsageStatisticHourUpdateOne {
+	if f != nil {
+		ushuo.SetConsumeCoin(*f)
 	}
 	return ushuo
 }
 
-// AddConsumeCoin adds u to the "consume_coin" field.
-func (ushuo *UsageStatisticHourUpdateOne) AddConsumeCoin(u int64) *UsageStatisticHourUpdateOne {
-	ushuo.mutation.AddConsumeCoin(u)
+// AddConsumeCoin adds f to the "consume_coin" field.
+func (ushuo *UsageStatisticHourUpdateOne) AddConsumeCoin(f float64) *UsageStatisticHourUpdateOne {
+	ushuo.mutation.AddConsumeCoin(f)
 	return ushuo
 }
 
@@ -1102,13 +1102,13 @@ func (ushuo *UsageStatisticHourUpdateOne) sqlSave(ctx context.Context) (_node *U
 		})
 	}
 	if value, ok := ushuo.mutation.ConsumeCoin(); ok {
-		_spec.SetField(usagestatistichour.FieldConsumeCoin, field.TypeUint64, value)
+		_spec.SetField(usagestatistichour.FieldConsumeCoin, field.TypeFloat64, value)
 	}
 	if value, ok := ushuo.mutation.AddedConsumeCoin(); ok {
-		_spec.AddField(usagestatistichour.FieldConsumeCoin, field.TypeUint64, value)
+		_spec.AddField(usagestatistichour.FieldConsumeCoin, field.TypeFloat64, value)
 	}
 	if ushuo.mutation.ConsumeCoinCleared() {
-		_spec.ClearField(usagestatistichour.FieldConsumeCoin, field.TypeUint64)
+		_spec.ClearField(usagestatistichour.FieldConsumeCoin, field.TypeFloat64)
 	}
 	_node = &UsageStatisticHour{config: ushuo.config}
 	_spec.Assign = _node.assignValues

+ 6 - 4
ent/usagestatisticmonth.go

@@ -54,7 +54,7 @@ type UsageStatisticMonth struct {
 	// 标签分布
 	LabelDist []custom_types.LabelDist `json:"label_dist,omitempty"`
 	// 消耗积分
-	ConsumeCoin  uint64 `json:"consume_coin,omitempty"`
+	ConsumeCoin  float64 `json:"consume_coin,omitempty"`
 	selectValues sql.SelectValues
 }
 
@@ -65,7 +65,9 @@ func (*UsageStatisticMonth) scanValues(columns []string) ([]any, error) {
 		switch columns[i] {
 		case usagestatisticmonth.FieldLabelDist:
 			values[i] = new([]byte)
-		case usagestatisticmonth.FieldID, usagestatisticmonth.FieldStatus, usagestatisticmonth.FieldAddtime, usagestatisticmonth.FieldType, usagestatisticmonth.FieldOrganizationID, usagestatisticmonth.FieldAiResponse, usagestatisticmonth.FieldSopRun, usagestatisticmonth.FieldTotalFriend, usagestatisticmonth.FieldTotalGroup, usagestatisticmonth.FieldAccountBalance, usagestatisticmonth.FieldConsumeToken, usagestatisticmonth.FieldActiveUser, usagestatisticmonth.FieldNewUser, usagestatisticmonth.FieldConsumeCoin:
+		case usagestatisticmonth.FieldConsumeCoin:
+			values[i] = new(sql.NullFloat64)
+		case usagestatisticmonth.FieldID, usagestatisticmonth.FieldStatus, usagestatisticmonth.FieldAddtime, usagestatisticmonth.FieldType, usagestatisticmonth.FieldOrganizationID, usagestatisticmonth.FieldAiResponse, usagestatisticmonth.FieldSopRun, usagestatisticmonth.FieldTotalFriend, usagestatisticmonth.FieldTotalGroup, usagestatisticmonth.FieldAccountBalance, usagestatisticmonth.FieldConsumeToken, usagestatisticmonth.FieldActiveUser, usagestatisticmonth.FieldNewUser:
 			values[i] = new(sql.NullInt64)
 		case usagestatisticmonth.FieldBotID:
 			values[i] = new(sql.NullString)
@@ -197,10 +199,10 @@ func (usm *UsageStatisticMonth) assignValues(columns []string, values []any) err
 				}
 			}
 		case usagestatisticmonth.FieldConsumeCoin:
-			if value, ok := values[i].(*sql.NullInt64); !ok {
+			if value, ok := values[i].(*sql.NullFloat64); !ok {
 				return fmt.Errorf("unexpected type %T for field consume_coin", values[i])
 			} else if value.Valid {
-				usm.ConsumeCoin = uint64(value.Int64)
+				usm.ConsumeCoin = value.Float64
 			}
 		default:
 			usm.selectValues.Set(columns[i], values[i])

+ 1 - 1
ent/usagestatisticmonth/usagestatisticmonth.go

@@ -104,7 +104,7 @@ var (
 	// DefaultStatus holds the default value on creation for the "status" field.
 	DefaultStatus uint8
 	// DefaultConsumeCoin holds the default value on creation for the "consume_coin" field.
-	DefaultConsumeCoin uint64
+	DefaultConsumeCoin float64
 )
 
 // OrderOption defines the ordering options for the UsageStatisticMonth queries.

+ 9 - 9
ent/usagestatisticmonth/where.go

@@ -135,7 +135,7 @@ func NewUser(v int64) predicate.UsageStatisticMonth {
 }
 
 // ConsumeCoin applies equality check predicate on the "consume_coin" field. It's identical to ConsumeCoinEQ.
-func ConsumeCoin(v uint64) predicate.UsageStatisticMonth {
+func ConsumeCoin(v float64) predicate.UsageStatisticMonth {
 	return predicate.UsageStatisticMonth(sql.FieldEQ(FieldConsumeCoin, v))
 }
 
@@ -845,42 +845,42 @@ func NewUserLTE(v int64) predicate.UsageStatisticMonth {
 }
 
 // ConsumeCoinEQ applies the EQ predicate on the "consume_coin" field.
-func ConsumeCoinEQ(v uint64) predicate.UsageStatisticMonth {
+func ConsumeCoinEQ(v float64) predicate.UsageStatisticMonth {
 	return predicate.UsageStatisticMonth(sql.FieldEQ(FieldConsumeCoin, v))
 }
 
 // ConsumeCoinNEQ applies the NEQ predicate on the "consume_coin" field.
-func ConsumeCoinNEQ(v uint64) predicate.UsageStatisticMonth {
+func ConsumeCoinNEQ(v float64) predicate.UsageStatisticMonth {
 	return predicate.UsageStatisticMonth(sql.FieldNEQ(FieldConsumeCoin, v))
 }
 
 // ConsumeCoinIn applies the In predicate on the "consume_coin" field.
-func ConsumeCoinIn(vs ...uint64) predicate.UsageStatisticMonth {
+func ConsumeCoinIn(vs ...float64) predicate.UsageStatisticMonth {
 	return predicate.UsageStatisticMonth(sql.FieldIn(FieldConsumeCoin, vs...))
 }
 
 // ConsumeCoinNotIn applies the NotIn predicate on the "consume_coin" field.
-func ConsumeCoinNotIn(vs ...uint64) predicate.UsageStatisticMonth {
+func ConsumeCoinNotIn(vs ...float64) predicate.UsageStatisticMonth {
 	return predicate.UsageStatisticMonth(sql.FieldNotIn(FieldConsumeCoin, vs...))
 }
 
 // ConsumeCoinGT applies the GT predicate on the "consume_coin" field.
-func ConsumeCoinGT(v uint64) predicate.UsageStatisticMonth {
+func ConsumeCoinGT(v float64) predicate.UsageStatisticMonth {
 	return predicate.UsageStatisticMonth(sql.FieldGT(FieldConsumeCoin, v))
 }
 
 // ConsumeCoinGTE applies the GTE predicate on the "consume_coin" field.
-func ConsumeCoinGTE(v uint64) predicate.UsageStatisticMonth {
+func ConsumeCoinGTE(v float64) predicate.UsageStatisticMonth {
 	return predicate.UsageStatisticMonth(sql.FieldGTE(FieldConsumeCoin, v))
 }
 
 // ConsumeCoinLT applies the LT predicate on the "consume_coin" field.
-func ConsumeCoinLT(v uint64) predicate.UsageStatisticMonth {
+func ConsumeCoinLT(v float64) predicate.UsageStatisticMonth {
 	return predicate.UsageStatisticMonth(sql.FieldLT(FieldConsumeCoin, v))
 }
 
 // ConsumeCoinLTE applies the LTE predicate on the "consume_coin" field.
-func ConsumeCoinLTE(v uint64) predicate.UsageStatisticMonth {
+func ConsumeCoinLTE(v float64) predicate.UsageStatisticMonth {
 	return predicate.UsageStatisticMonth(sql.FieldLTE(FieldConsumeCoin, v))
 }
 

+ 12 - 12
ent/usagestatisticmonth_create.go

@@ -174,15 +174,15 @@ func (usmc *UsageStatisticMonthCreate) SetLabelDist(ctd []custom_types.LabelDist
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (usmc *UsageStatisticMonthCreate) SetConsumeCoin(u uint64) *UsageStatisticMonthCreate {
-	usmc.mutation.SetConsumeCoin(u)
+func (usmc *UsageStatisticMonthCreate) SetConsumeCoin(f float64) *UsageStatisticMonthCreate {
+	usmc.mutation.SetConsumeCoin(f)
 	return usmc
 }
 
 // SetNillableConsumeCoin sets the "consume_coin" field if the given value is not nil.
-func (usmc *UsageStatisticMonthCreate) SetNillableConsumeCoin(u *uint64) *UsageStatisticMonthCreate {
-	if u != nil {
-		usmc.SetConsumeCoin(*u)
+func (usmc *UsageStatisticMonthCreate) SetNillableConsumeCoin(f *float64) *UsageStatisticMonthCreate {
+	if f != nil {
+		usmc.SetConsumeCoin(*f)
 	}
 	return usmc
 }
@@ -398,7 +398,7 @@ func (usmc *UsageStatisticMonthCreate) createSpec() (*UsageStatisticMonth, *sqlg
 		_node.LabelDist = value
 	}
 	if value, ok := usmc.mutation.ConsumeCoin(); ok {
-		_spec.SetField(usagestatisticmonth.FieldConsumeCoin, field.TypeUint64, value)
+		_spec.SetField(usagestatisticmonth.FieldConsumeCoin, field.TypeFloat64, value)
 		_node.ConsumeCoin = value
 	}
 	return _node, _spec
@@ -742,7 +742,7 @@ func (u *UsageStatisticMonthUpsert) UpdateLabelDist() *UsageStatisticMonthUpsert
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (u *UsageStatisticMonthUpsert) SetConsumeCoin(v uint64) *UsageStatisticMonthUpsert {
+func (u *UsageStatisticMonthUpsert) SetConsumeCoin(v float64) *UsageStatisticMonthUpsert {
 	u.Set(usagestatisticmonth.FieldConsumeCoin, v)
 	return u
 }
@@ -754,7 +754,7 @@ func (u *UsageStatisticMonthUpsert) UpdateConsumeCoin() *UsageStatisticMonthUpse
 }
 
 // AddConsumeCoin adds v to the "consume_coin" field.
-func (u *UsageStatisticMonthUpsert) AddConsumeCoin(v uint64) *UsageStatisticMonthUpsert {
+func (u *UsageStatisticMonthUpsert) AddConsumeCoin(v float64) *UsageStatisticMonthUpsert {
 	u.Add(usagestatisticmonth.FieldConsumeCoin, v)
 	return u
 }
@@ -1153,14 +1153,14 @@ func (u *UsageStatisticMonthUpsertOne) UpdateLabelDist() *UsageStatisticMonthUps
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (u *UsageStatisticMonthUpsertOne) SetConsumeCoin(v uint64) *UsageStatisticMonthUpsertOne {
+func (u *UsageStatisticMonthUpsertOne) SetConsumeCoin(v float64) *UsageStatisticMonthUpsertOne {
 	return u.Update(func(s *UsageStatisticMonthUpsert) {
 		s.SetConsumeCoin(v)
 	})
 }
 
 // AddConsumeCoin adds v to the "consume_coin" field.
-func (u *UsageStatisticMonthUpsertOne) AddConsumeCoin(v uint64) *UsageStatisticMonthUpsertOne {
+func (u *UsageStatisticMonthUpsertOne) AddConsumeCoin(v float64) *UsageStatisticMonthUpsertOne {
 	return u.Update(func(s *UsageStatisticMonthUpsert) {
 		s.AddConsumeCoin(v)
 	})
@@ -1734,14 +1734,14 @@ func (u *UsageStatisticMonthUpsertBulk) UpdateLabelDist() *UsageStatisticMonthUp
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (u *UsageStatisticMonthUpsertBulk) SetConsumeCoin(v uint64) *UsageStatisticMonthUpsertBulk {
+func (u *UsageStatisticMonthUpsertBulk) SetConsumeCoin(v float64) *UsageStatisticMonthUpsertBulk {
 	return u.Update(func(s *UsageStatisticMonthUpsert) {
 		s.SetConsumeCoin(v)
 	})
 }
 
 // AddConsumeCoin adds v to the "consume_coin" field.
-func (u *UsageStatisticMonthUpsertBulk) AddConsumeCoin(v uint64) *UsageStatisticMonthUpsertBulk {
+func (u *UsageStatisticMonthUpsertBulk) AddConsumeCoin(v float64) *UsageStatisticMonthUpsertBulk {
 	return u.Update(func(s *UsageStatisticMonthUpsert) {
 		s.AddConsumeCoin(v)
 	})

+ 22 - 22
ent/usagestatisticmonth_update.go

@@ -353,23 +353,23 @@ func (usmu *UsageStatisticMonthUpdate) AppendLabelDist(ctd []custom_types.LabelD
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (usmu *UsageStatisticMonthUpdate) SetConsumeCoin(u uint64) *UsageStatisticMonthUpdate {
+func (usmu *UsageStatisticMonthUpdate) SetConsumeCoin(f float64) *UsageStatisticMonthUpdate {
 	usmu.mutation.ResetConsumeCoin()
-	usmu.mutation.SetConsumeCoin(u)
+	usmu.mutation.SetConsumeCoin(f)
 	return usmu
 }
 
 // SetNillableConsumeCoin sets the "consume_coin" field if the given value is not nil.
-func (usmu *UsageStatisticMonthUpdate) SetNillableConsumeCoin(u *uint64) *UsageStatisticMonthUpdate {
-	if u != nil {
-		usmu.SetConsumeCoin(*u)
+func (usmu *UsageStatisticMonthUpdate) SetNillableConsumeCoin(f *float64) *UsageStatisticMonthUpdate {
+	if f != nil {
+		usmu.SetConsumeCoin(*f)
 	}
 	return usmu
 }
 
-// AddConsumeCoin adds u to the "consume_coin" field.
-func (usmu *UsageStatisticMonthUpdate) AddConsumeCoin(u int64) *UsageStatisticMonthUpdate {
-	usmu.mutation.AddConsumeCoin(u)
+// AddConsumeCoin adds f to the "consume_coin" field.
+func (usmu *UsageStatisticMonthUpdate) AddConsumeCoin(f float64) *UsageStatisticMonthUpdate {
+	usmu.mutation.AddConsumeCoin(f)
 	return usmu
 }
 
@@ -537,13 +537,13 @@ func (usmu *UsageStatisticMonthUpdate) sqlSave(ctx context.Context) (n int, err
 		})
 	}
 	if value, ok := usmu.mutation.ConsumeCoin(); ok {
-		_spec.SetField(usagestatisticmonth.FieldConsumeCoin, field.TypeUint64, value)
+		_spec.SetField(usagestatisticmonth.FieldConsumeCoin, field.TypeFloat64, value)
 	}
 	if value, ok := usmu.mutation.AddedConsumeCoin(); ok {
-		_spec.AddField(usagestatisticmonth.FieldConsumeCoin, field.TypeUint64, value)
+		_spec.AddField(usagestatisticmonth.FieldConsumeCoin, field.TypeFloat64, value)
 	}
 	if usmu.mutation.ConsumeCoinCleared() {
-		_spec.ClearField(usagestatisticmonth.FieldConsumeCoin, field.TypeUint64)
+		_spec.ClearField(usagestatisticmonth.FieldConsumeCoin, field.TypeFloat64)
 	}
 	if n, err = sqlgraph.UpdateNodes(ctx, usmu.driver, _spec); err != nil {
 		if _, ok := err.(*sqlgraph.NotFoundError); ok {
@@ -888,23 +888,23 @@ func (usmuo *UsageStatisticMonthUpdateOne) AppendLabelDist(ctd []custom_types.La
 }
 
 // SetConsumeCoin sets the "consume_coin" field.
-func (usmuo *UsageStatisticMonthUpdateOne) SetConsumeCoin(u uint64) *UsageStatisticMonthUpdateOne {
+func (usmuo *UsageStatisticMonthUpdateOne) SetConsumeCoin(f float64) *UsageStatisticMonthUpdateOne {
 	usmuo.mutation.ResetConsumeCoin()
-	usmuo.mutation.SetConsumeCoin(u)
+	usmuo.mutation.SetConsumeCoin(f)
 	return usmuo
 }
 
 // SetNillableConsumeCoin sets the "consume_coin" field if the given value is not nil.
-func (usmuo *UsageStatisticMonthUpdateOne) SetNillableConsumeCoin(u *uint64) *UsageStatisticMonthUpdateOne {
-	if u != nil {
-		usmuo.SetConsumeCoin(*u)
+func (usmuo *UsageStatisticMonthUpdateOne) SetNillableConsumeCoin(f *float64) *UsageStatisticMonthUpdateOne {
+	if f != nil {
+		usmuo.SetConsumeCoin(*f)
 	}
 	return usmuo
 }
 
-// AddConsumeCoin adds u to the "consume_coin" field.
-func (usmuo *UsageStatisticMonthUpdateOne) AddConsumeCoin(u int64) *UsageStatisticMonthUpdateOne {
-	usmuo.mutation.AddConsumeCoin(u)
+// AddConsumeCoin adds f to the "consume_coin" field.
+func (usmuo *UsageStatisticMonthUpdateOne) AddConsumeCoin(f float64) *UsageStatisticMonthUpdateOne {
+	usmuo.mutation.AddConsumeCoin(f)
 	return usmuo
 }
 
@@ -1102,13 +1102,13 @@ func (usmuo *UsageStatisticMonthUpdateOne) sqlSave(ctx context.Context) (_node *
 		})
 	}
 	if value, ok := usmuo.mutation.ConsumeCoin(); ok {
-		_spec.SetField(usagestatisticmonth.FieldConsumeCoin, field.TypeUint64, value)
+		_spec.SetField(usagestatisticmonth.FieldConsumeCoin, field.TypeFloat64, value)
 	}
 	if value, ok := usmuo.mutation.AddedConsumeCoin(); ok {
-		_spec.AddField(usagestatisticmonth.FieldConsumeCoin, field.TypeUint64, value)
+		_spec.AddField(usagestatisticmonth.FieldConsumeCoin, field.TypeFloat64, value)
 	}
 	if usmuo.mutation.ConsumeCoinCleared() {
-		_spec.ClearField(usagestatisticmonth.FieldConsumeCoin, field.TypeUint64)
+		_spec.ClearField(usagestatisticmonth.FieldConsumeCoin, field.TypeFloat64)
 	}
 	_node = &UsageStatisticMonth{config: usmuo.config}
 	_spec.Assign = _node.assignValues

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

@@ -117,7 +117,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 	accountBalance := types.ChartsUint{}
 	accountBalance.LabelText = "积分"
 	consumeToken := types.ChartsUint{}
-	consumeCoin := types.ChartsUint{}
+	consumeCoin := types.ChartsFloat{}
 	activeUser := types.ChartsUint{}
 	activeUser.Tip = &activeUserTip
 	newUser := types.ChartsInt{}
@@ -368,7 +368,7 @@ func (l *GetChartsLogic) GetCharts(req *types.ChartsReq) (resp *types.ChartsResp
 				var totalFriendOfDay uint64
 				var totalGroupOfDay uint64
 				var consumeTokenOfDay uint64
-				var consumeCoinOfDay uint64
+				var consumeCoinOfDay float64
 				var activeUserOfDay uint64
 				var newUserOfDay int64
 

+ 10 - 1
internal/types/types.go

@@ -3578,7 +3578,7 @@ type ChartsData struct {
 	ActiveUser     *ChartsUint  `json:"active_user"`
 	NewUser        *ChartsInt   `json:"new_user"`
 	LabelDist      []LabelsData `json:"label_dist"`
-	ConsumeCoin    *ChartsUint  `json:"consume_coin"`
+	ConsumeCoin    *ChartsFloat `json:"consume_coin"`
 }
 
 type ChartsUint struct {
@@ -3590,6 +3590,15 @@ type ChartsUint struct {
 	Tip       *string  `json:"tip"`
 }
 
+type ChartsFloat struct {
+	Count     float64   `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"`