Browse Source

update

master
shenjiachi 4 days ago
parent
commit
7c0257ae53
6 changed files with 34 additions and 8 deletions
  1. +2
    -0
      app/hdl/institutional_management/egg_energy/hdl_basic.go
  2. +6
    -4
      app/md/institutional_management/egg_energy/md_basic.go
  3. +9
    -1
      docs/docs.go
  4. +9
    -1
      docs/swagger.json
  5. +7
    -1
      docs/swagger.yaml
  6. +1
    -1
      go.mod

+ 2
- 0
app/hdl/institutional_management/egg_energy/hdl_basic.go View File

@@ -238,6 +238,7 @@ func GetEggEnergyBasic(c *gin.Context) {
RewardSystem: rewardSystem,
NewUserIncentiveRules: newUserRewardRules,
SystemID: basicSettings.Id,
SettlementQuantity: basicSettings.SettlementQuantity,
}

e.OutSuc(c, resp, nil)
@@ -292,6 +293,7 @@ func UpdateEggEnergyBasic(c *gin.Context) {
RewardSystem: rewardSystemStr,
NewUserIncentiveRules: newUserIncentiveRulesStr,
TotalTeamDividends: req.DataSetting.TotalTeamDividends,
SettlementQuantity: req.SettlementQuantity,
}

forceColums := []string{"is_open", "video_reward_is_open"}


+ 6
- 4
app/md/institutional_management/egg_energy/md_basic.go View File

@@ -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:"团队分红"` // 团队分红
@@ -55,6 +55,7 @@ type GetEggEnergyBasicResp struct {
RewardSystem []md.RewardSystemStruct `json:"reward_system"` // 圈层奖励
NewUserIncentiveRules md.NewUserRewardRules `json:"new_user_incentive_rules"` // 新用户奖励规则
SystemID int `json:"system_id"` // 该设置系统 ID
SettlementQuantity int `json:"settlement_quantity"` // 结算数量(百分比)
}

type UpdateEggEnergyBasicReq struct {
@@ -67,6 +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"` // 结算数量(百分比)
}

type AddVirtualCoinNode struct {
@@ -123,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 {


+ 9
- 1
docs/docs.go View File

@@ -10056,7 +10056,7 @@ const docTemplate = `{
"properties": {
"is_punish": {
"description": "是否为处罚标签(0:否 1:是)",
"type": "string"
"type": "integer"
},
"memo": {
"description": "备注",
@@ -12364,6 +12364,10 @@ const docTemplate = `{
"$ref": "#/definitions/md.RewardSystemStruct"
}
},
"settlement_quantity": {
"description": "结算数量(百分比)",
"type": "integer"
},
"system_id": {
"description": "该设置系统 ID",
"type": "integer"
@@ -15186,6 +15190,10 @@ const docTemplate = `{
"$ref": "#/definitions/md.RewardSystemStruct"
}
},
"settlement_quantity": {
"description": "结算数量(百分比)",
"type": "integer"
},
"system_id": {
"description": "该设置系统 ID",
"type": "integer"


+ 9
- 1
docs/swagger.json View File

@@ -10049,7 +10049,7 @@
"properties": {
"is_punish": {
"description": "是否为处罚标签(0:否 1:是)",
"type": "string"
"type": "integer"
},
"memo": {
"description": "备注",
@@ -12357,6 +12357,10 @@
"$ref": "#/definitions/md.RewardSystemStruct"
}
},
"settlement_quantity": {
"description": "结算数量(百分比)",
"type": "integer"
},
"system_id": {
"description": "该设置系统 ID",
"type": "integer"
@@ -15179,6 +15183,10 @@
"$ref": "#/definitions/md.RewardSystemStruct"
}
},
"settlement_quantity": {
"description": "结算数量(百分比)",
"type": "integer"
},
"system_id": {
"description": "该设置系统 ID",
"type": "integer"


+ 7
- 1
docs/swagger.yaml View File

@@ -510,7 +510,7 @@ definitions:
properties:
is_punish:
description: 是否为处罚标签(0:否 1:是)
type: string
type: integer
memo:
description: 备注
type: string
@@ -2091,6 +2091,9 @@ definitions:
items:
$ref: '#/definitions/md.RewardSystemStruct'
type: array
settlement_quantity:
description: 结算数量(百分比)
type: integer
system_id:
description: 该设置系统 ID
type: integer
@@ -4062,6 +4065,9 @@ definitions:
items:
$ref: '#/definitions/md.RewardSystemStruct'
type: array
settlement_quantity:
description: 结算数量(百分比)
type: integer
system_id:
description: 该设置系统 ID
type: integer


+ 1
- 1
go.mod View File

@@ -33,7 +33,7 @@ require (
)

require (
code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241213070558-a1f0ce782dff
code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241213133441-2deb4b1095b4
code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241212140020-c99f60b4f868
code.fnuoos.com/go_rely_warehouse/zyos_go_es.git v1.0.1-0.20241118083738-0f22da9ba0be
code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.5


Loading…
Cancel
Save