diff --git a/app/hdl/institutional_management/egg_energy/hdl_basic.go b/app/hdl/institutional_management/egg_energy/hdl_basic.go index 964cd82..c97b45b 100644 --- a/app/hdl/institutional_management/egg_energy/hdl_basic.go +++ b/app/hdl/institutional_management/egg_energy/hdl_basic.go @@ -89,7 +89,7 @@ func GetEggEnergyBasic(c *gin.Context) { var newUserRewardRules md2.NewUserRewardRules utils.Unserialize([]byte(basicSettings.NewUserIncentiveRules), &newUserRewardRules) - var directPushReward md2.TeamRewardSettingStruct + var directPushReward md2.DirectPushRewardSettingStruct utils.Unserialize([]byte(basicSettings.DirectPushReward), &directPushReward) resp := md.GetEggEnergyBasicResp{ @@ -99,11 +99,9 @@ func GetEggEnergyBasic(c *gin.Context) { TeamEggEnergyCoinId: basicSettings.TeamEggEnergyCoinId, PersonEggPointsCoinId: basicSettings.PersonEggPointsCoinId, TeamEggPointsCoinId: basicSettings.TeamEggPointsCoinId, - DirectPushReward: md2.TeamRewardSettingStruct{ - RewardDecrementValue: directPushReward.RewardDecrementValue, - RewardEndValue: directPushReward.RewardEndValue, + DirectPushReward: md2.DirectPushRewardSettingStruct{ + RewardRateValue: directPushReward.RewardRateValue, MemberSelfIsOpenGetTeamReward: directPushReward.MemberSelfIsOpenGetTeamReward, - OneRoundDuration: directPushReward.OneRoundDuration, }, }, VideoRewardSetting: md.VideoRewardSetting{ diff --git a/app/md/institutional_management/egg_energy/md_basic.go b/app/md/institutional_management/egg_energy/md_basic.go index 669000e..0215d72 100644 --- a/app/md/institutional_management/egg_energy/md_basic.go +++ b/app/md/institutional_management/egg_energy/md_basic.go @@ -19,12 +19,12 @@ type VirtualCoin struct { // BasicSetting 基础设置 type BasicSetting struct { - IsOpen int `json:"is_open" ` // 是否开启(1：开启 0：关闭) - PersonEggEnergyCoinId int `json:"person_egg_energy_coin_id" ` // 个人蛋蛋能量对应虚拟币 id - TeamEggEnergyCoinId int `json:"team_egg_energy_coin_id" ` // 团队蛋蛋能量对应虚拟币 id - PersonEggPointsCoinId int `json:"person_egg_points_coin_id" ` // 个人蛋蛋积分对应虚拟币 id - TeamEggPointsCoinId int `json:"team_egg_points_coin_id" ` // 团队蛋蛋积分对应虚拟币 id - DirectPushReward md.TeamRewardSettingStruct `json:"direct_push_reward"` // 直推奖励 + IsOpen int `json:"is_open" ` // 是否开启(1：开启 0：关闭) + PersonEggEnergyCoinId int `json:"person_egg_energy_coin_id" ` // 个人蛋蛋能量对应虚拟币 id + TeamEggEnergyCoinId int `json:"team_egg_energy_coin_id" ` // 团队蛋蛋能量对应虚拟币 id + PersonEggPointsCoinId int `json:"person_egg_points_coin_id" ` // 个人蛋蛋积分对应虚拟币 id + TeamEggPointsCoinId int `json:"team_egg_points_coin_id" ` // 团队蛋蛋积分对应虚拟币 id + DirectPushReward md.DirectPushRewardSettingStruct `json:"direct_push_reward"` // 直推奖励 } // VideoRewardSetting 视频奖励 diff --git a/docs/docs.go b/docs/docs.go index 5a757f1..5b87572 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -1,5 +1,4 @@ -// Code generated by swaggo/swag. DO NOT EDIT. - +// Package docs Code generated by swaggo/swag. DO NOT EDIT package docs import "github.com/swaggo/swag" @@ -1353,9 +1352,7 @@ const docTemplate = `{ "name": "req", "in": "body", "required": true, - "schema": { - "type": "object" - } + "schema": {} } ], "responses": { @@ -6423,7 +6420,7 @@ const docTemplate = `{ "description": "直推奖励", "allOf": [ { - "$ref": "#/definitions/md.TeamRewardSettingStruct" + "$ref": "#/definitions/md.DirectPushRewardSettingStruct" } ] }, @@ -7078,6 +7075,15 @@ const docTemplate = `{ "md.AdvertisingListResp": { "type": "object", "properties": { + "adv_data": { + "type": "array", + "items": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + }, "list": { "type": "array", "items": { @@ -7865,6 +7871,19 @@ const docTemplate = `{ } } }, + "md.DirectPushRewardSettingStruct": { + "type": "object", + "properties": { + "member_self_is_open_get_team_reward": { + "description": "会员是否活跃得到团队奖励", + "type": "string" + }, + "reward_rate_value": { + "description": "奖励百分比", + "type": "string" + } + } + }, "md.DynamicDataFlowListReq": { "type": "object", "properties": { @@ -10681,27 +10700,6 @@ const docTemplate = `{ } } }, - "md.TeamRewardSettingStruct": { - "type": "object", - "properties": { - "member_self_is_open_get_team_reward": { - "description": "会员是否活跃得到团队奖励", - "type": "string" - }, - "one_round_duration": { - "description": "一轮持续时间", - "type": "string" - }, - "reward_decrement_value": { - "description": "递减百分比", - "type": "string" - }, - "reward_end_value": { - "description": "奖励结束值", - "type": "string" - } - } - }, "md.TreeNode": { "type": "object", "properties": { @@ -12355,6 +12353,8 @@ var SwaggerInfo = &swag.Spec{ Description: "管理后台接口文档", InfoInstanceName: "swagger", SwaggerTemplate: docTemplate, + LeftDelim: "{{", + RightDelim: "}}", } func init() { diff --git a/docs/swagger.json b/docs/swagger.json index 8dbeee2..34688dd 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -1345,9 +1345,7 @@ "name": "req", "in": "body", "required": true, - "schema": { - "type": "object" - } + "schema": {} } ], "responses": { @@ -6415,7 +6413,7 @@ "description": "直推奖励", "allOf": [ { - "$ref": "#/definitions/md.TeamRewardSettingStruct" + "$ref": "#/definitions/md.DirectPushRewardSettingStruct" } ] }, @@ -7070,6 +7068,15 @@ "md.AdvertisingListResp": { "type": "object", "properties": { + "adv_data": { + "type": "array", + "items": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + }, "list": { "type": "array", "items": { @@ -7857,6 +7864,19 @@ } } }, + "md.DirectPushRewardSettingStruct": { + "type": "object", + "properties": { + "member_self_is_open_get_team_reward": { + "description": "会员是否活跃得到团队奖励", + "type": "string" + }, + "reward_rate_value": { + "description": "奖励百分比", + "type": "string" + } + } + }, "md.DynamicDataFlowListReq": { "type": "object", "properties": { @@ -10673,27 +10693,6 @@ } } }, - "md.TeamRewardSettingStruct": { - "type": "object", - "properties": { - "member_self_is_open_get_team_reward": { - "description": "会员是否活跃得到团队奖励", - "type": "string" - }, - "one_round_duration": { - "description": "一轮持续时间", - "type": "string" - }, - "reward_decrement_value": { - "description": "递减百分比", - "type": "string" - }, - "reward_end_value": { - "description": "奖励结束值", - "type": "string" - } - } - }, "md.TreeNode": { "type": "object", "properties": { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 329c2b7..aa15448 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -57,7 +57,7 @@ definitions: properties: direct_push_reward: allOf: - - $ref: '#/definitions/md.TeamRewardSettingStruct' + - $ref: '#/definitions/md.DirectPushRewardSettingStruct' description: 直推奖励 is_open: description: 是否开启(1：开启 0：关闭) @@ -514,6 +514,12 @@ definitions: type: object md.AdvertisingListResp: properties: + adv_data: + items: + additionalProperties: + type: string + type: object + type: array list: items: $ref: '#/definitions/md.AdvertisingList' @@ -1052,6 +1058,15 @@ definitions: description: 星级分红百分比 type: string type: object + md.DirectPushRewardSettingStruct: + properties: + member_self_is_open_get_team_reward: + description: 会员是否活跃得到团队奖励 + type: string + reward_rate_value: + description: 奖励百分比 + type: string + type: object md.DynamicDataFlowListReq: properties: end_at: @@ -3024,21 +3039,6 @@ definitions: description: 标签 名称 type: string type: object - md.TeamRewardSettingStruct: - properties: - member_self_is_open_get_team_reward: - description: 会员是否活跃得到团队奖励 - type: string - one_round_duration: - description: 一轮持续时间 - type: string - reward_decrement_value: - description: 递减百分比 - type: string - reward_end_value: - description: 奖励结束值 - type: string - type: object md.TreeNode: properties: avatar_url: @@ -5055,8 +5055,7 @@ paths: in: body name: req required: true - schema: - type: object + schema: {} produces: - application/json responses: diff --git a/go.mod b/go.mod index 02e0c1a..45cebdd 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( require ( code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241128030209-743f36ef9dad - code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241127101803-8cd39f7b84b2 + code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241128063602-ed11b9dad994 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 github.com/360EntSecGroup-Skylar/excelize v1.4.1