diff --git a/app/hdl/institutional_management/egg_energy/hdl_basic.go b/app/hdl/institutional_management/egg_energy/hdl_basic.go index 99d09ba..5a5d4d1 100644 --- a/app/hdl/institutional_management/egg_energy/hdl_basic.go +++ b/app/hdl/institutional_management/egg_energy/hdl_basic.go @@ -293,7 +293,7 @@ func UpdateEggEnergyBasic(c *gin.Context) { RewardSystem: rewardSystemStr, NewUserIncentiveRules: newUserIncentiveRulesStr, TotalTeamDividends: req.DataSetting.TotalTeamDividends, - SettlementQuantity: req.SettlementQuantity, + SettlementQuantity: utils.StrToInt(req.SettlementQuantity), } forceColums := []string{"is_open", "video_reward_is_open"} diff --git a/app/hdl/institutional_management/egg_energy/hdl_user_coin.go b/app/hdl/institutional_management/egg_energy/hdl_user_coin.go index cf91109..4544a57 100644 --- a/app/hdl/institutional_management/egg_energy/hdl_user_coin.go +++ b/app/hdl/institutional_management/egg_energy/hdl_user_coin.go @@ -47,12 +47,12 @@ func GetEggEnergyUserCoinList(c *gin.Context) { kind1 := md.VirtualCoinListNode{ Kind: 1, CoinID: eggEnergyBasicSetting.PersonEggEnergyCoinId, - Name: "个人蛋蛋能量", + Name: "个人能量值", } kind2 := md.VirtualCoinListNode{ Kind: 2, CoinID: eggEnergyBasicSetting.TeamEggEnergyCoinId, - Name: "团队蛋蛋能量", + Name: "团队能量值", } kindList[0] = kind1 kindList[1] = kind2 @@ -215,12 +215,12 @@ func GetEggPointsUserCoinList(c *gin.Context) { kind1 := md.VirtualCoinListNode{ Kind: 1, CoinID: eggEnergyBasicSetting.PersonEggPointsCoinId, - Name: "个人蛋蛋积分", + Name: "个人活跃值", } kind2 := md.VirtualCoinListNode{ Kind: 2, CoinID: eggEnergyBasicSetting.TeamEggPointsCoinId, - Name: "团队蛋蛋积分", + Name: "团队活跃值", } kindList[0] = kind1 kindList[1] = kind2 diff --git a/app/md/institutional_management/egg_energy/md_basic.go b/app/md/institutional_management/egg_energy/md_basic.go index 39ab719..edd0290 100644 --- a/app/md/institutional_management/egg_energy/md_basic.go +++ b/app/md/institutional_management/egg_energy/md_basic.go @@ -10,9 +10,9 @@ const ( type VirtualCoin struct { Id int `json:"id" ` - Name string `json:"name" ` // 名称 + Name string `json:"name" ` // 名称 ExchangeRatio string `json:"exchange_ratio" example:"兑换比例(与金额)"` // 兑换比例(与金额) - IsUse int `json:"is_use" ` // 是否开启: 0否 1是 + IsUse int `json:"is_use" ` // 是否开启: 0否 1是 CreateAt string `json:"create_at" ` UpdateAt string `json:"update_at" ` } @@ -37,7 +37,7 @@ type VideoRewardSetting struct { type DataSetting struct { TotalIssuanceAmount string `json:"total_issuance_amount" example:"总发行量"` // 总发行量 TotalTechnologyTeam string `json:"total_technology_team" example:"技术团队"` // 技术团队 - TotalAngelInvestor string `json:"total_angel_investor" example:"天使投资人"` // 天使投资人 + TotalAngelInvestor string `json:"total_angel_investor" example:"天使投资人"` // 天使投资人 TotalOperateFund string `json:"total_operate_fund" example:"运营资金"` // 运营资金 TotalEcologicalDevelopment string `json:"total_ecological_development" example:"当前价格"` // 生态建设 TotalTeamDividends string `json:"total_team_dividends" example:"团队分红"` // 团队分红 @@ -68,7 +68,7 @@ type UpdateEggEnergyBasicReq struct { ExchangeRules md.ExchangeRulesStruct `json:"exchange_rules"` // 兑换规则 RewardSystem []md.RewardSystemStruct `json:"reward_system"` // 圈层奖励 NewUserIncentiveRules md.NewUserRewardRules `json:"new_user_incentive_rules"` // 新用户奖励规则 // 新用户奖励规则 - SettlementQuantity int `json:"settlement_quantity"` // 结算数量(百分比) + SettlementQuantity string `json:"settlement_quantity"` // 结算数量(百分比) } type AddVirtualCoinNode struct { @@ -125,7 +125,7 @@ type GetEggCoreDataListResp struct { PlanetTotalValue string `json:"planet_total_value" example:"星球价值"` // 星球价值 NowPrice string `json:"now_price" example:"当前价格"` // 当前价格 NowEnergyTotalNums string `json:"now_energy_total_nums" example:"现行总量"` // 现行总量 - UserHoldTotalNums string `json:"user_hold_total_nums"` // 用户持有总量 + UserHoldTotalNums string `json:"user_hold_total_nums"` // 用户持有总量 } type GetEggEnergyCoreDataResp struct {