diff --git a/app/hdl/institutional_management/public_platoon/hdl_basic.go b/app/hdl/institutional_management/public_platoon/hdl_basic.go index 80ec94b..bab6952 100644 --- a/app/hdl/institutional_management/public_platoon/hdl_basic.go +++ b/app/hdl/institutional_management/public_platoon/hdl_basic.go @@ -51,10 +51,20 @@ func GetPublicPlatoonBasic(c *gin.Context) { } } + userDb := implement.NewUserDb(db.Db) + originator, err := userDb.UserGetOneByParams(map[string]interface{}{ + "key": "uid", + "value": publicPlatoonBasic.OriginatorUid, + }) + if err != nil { + e.OutErr(c, e.ERR_DB_ORM, err) + return + } var resp md.GetPublicPlatoonBasicResp resp = md.GetPublicPlatoonBasicResp{ IsOpen: publicPlatoonBasic.IsOpen, OriginatorUid: publicPlatoonBasic.OriginatorUid, + OriginatorName: originator.Nickname, SeveralTimes: publicPlatoonBasic.SeveralTimes, SeveralRows: publicPlatoonBasic.SeveralRows, SystemPunishReplace: publicPlatoonBasic.SystemPunishReplace, diff --git a/app/md/institutional_management/member_center/md_user_management.go b/app/md/institutional_management/member_center/md_user_management.go index 8b7a233..9111a62 100644 --- a/app/md/institutional_management/member_center/md_user_management.go +++ b/app/md/institutional_management/member_center/md_user_management.go @@ -16,7 +16,7 @@ type UserManagementGetUserListReq struct { Sex int `json:"sex"` // 性别 UnionId string `json:"union_id" example:"微信号"` Level int `json:"level"` // 会员等级 - RegisterType int `json:"register_type"` // 注册类型(0.未知, 1.免验证码手机号注册，2.微信授权) + RegisterType int `json:"register_type"` // 注册类型(1:APP注册、2:H5注册) State int `json:"state"` // 状态 Effective int `json:"effective"` // 有效会员 IsRealName int `json:"is_real_name"` // 是否实名 0.未实名,1.已实名 diff --git a/app/md/institutional_management/public_platoon/md_public_platoon.go b/app/md/institutional_management/public_platoon/md_public_platoon.go index e7490ae..042c28d 100644 --- a/app/md/institutional_management/public_platoon/md_public_platoon.go +++ b/app/md/institutional_management/public_platoon/md_public_platoon.go @@ -1,13 +1,14 @@ package md type GetPublicPlatoonBasicResp struct { - IsOpen int `json:"is_open"` // 是否开启(1:开启 0:关闭) - OriginatorUid int `json:"originator_uid"` // 创始人uid - SeveralTimes int `json:"several_times"` // 几乘 - SeveralRows int `json:"several_rows"` // 几排 - SystemPunishReplace int `json:"system_punish_replace"` // 是否位置滑落 被新用户替换 0否 1是 - SystemPunishReplaceValue int `json:"system_punish_replace_value"` // xx天未活跃，处罚滑落 - IsSelfActiveGetTeamRevenue int `json:"is_self_active_get_team_revenue"` // 会员本人没有日活，没有圈层奖励(1:开启 0:关闭) + IsOpen int `json:"is_open"` // 是否开启(1:开启 0:关闭) + OriginatorUid int `json:"originator_uid"` // 创始人uid + OriginatorName string `json:"originator_name"` // 创始人名称 + SeveralTimes int `json:"several_times"` // 几乘 + SeveralRows int `json:"several_rows"` // 几排 + SystemPunishReplace int `json:"system_punish_replace"` // 是否位置滑落 被新用户替换 0否 1是 + SystemPunishReplaceValue int `json:"system_punish_replace_value"` // xx天未活跃，处罚滑落 + IsSelfActiveGetTeamRevenue int `json:"is_self_active_get_team_revenue"` // 会员本人没有日活，没有圈层奖励(1:开启 0:关闭) } type UpdatePublicPlatoonBasicReq struct { diff --git a/docs/docs.go b/docs/docs.go index dc5702c..535f0bf 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -719,7 +719,7 @@ const docTemplate = `{ }, "/api/institutionalManagement/eggEnergy/globalData/platformRevenueList": { "post": { - "description": "平台营收数据(获取)", + "description": "其他广告设置数据(获取)", "consumes": [ "application/json" ], @@ -729,7 +729,7 @@ const docTemplate = `{ "tags": [ "蛋蛋能量" ], - "summary": "制度中心-蛋蛋能量-平台营收数据(获取)", + "summary": "制度中心-蛋蛋能量-平台营收-其他广告设置数据(获取)", "parameters": [ { "type": "string", @@ -810,7 +810,7 @@ const docTemplate = `{ }, "/api/institutionalManagement/eggEnergy/platformRevenue/PlatformRevenueAdd": { "post": { - "description": "平台营收数据(新增)", + "description": "其他广告设置数据(新增)", "consumes": [ "application/json" ], @@ -820,7 +820,7 @@ const docTemplate = `{ "tags": [ "蛋蛋能量" ], - "summary": "制度中心-蛋蛋能量-平台营收数据(新增)", + "summary": "制度中心-蛋蛋能量-平台营收-其他广告设置数据(新增)", "parameters": [ { "type": "string", @@ -855,7 +855,54 @@ const docTemplate = `{ } } }, - "/api/institutionalManagement/eggEnergy/platformRevenue/SetVideoReward": { + "/api/institutionalManagement/eggEnergy/platformRevenue/getVideoReward": { + "post": { + "description": "激励视频(获取)", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "蛋蛋能量" + ], + "summary": "制度中心-蛋蛋能量-平台营收-激励视频(获取)", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + }, + { + "description": "落地页不填页大小默认20条数据", + "name": "req", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/md.SetVideoRewardReq" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/md.GetVideoRewardResp" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, + "/api/institutionalManagement/eggEnergy/platformRevenue/setVideoReward": { "post": { "description": "激励视频(设置)", "consumes": [ @@ -867,7 +914,7 @@ const docTemplate = `{ "tags": [ "蛋蛋能量" ], - "summary": "制度中心-蛋蛋能量-激励视频(设置)", + "summary": "制度中心-蛋蛋能量-平台营收-激励视频(设置)", "parameters": [ { "type": "string", @@ -3351,6 +3398,10 @@ const docTemplate = `{ "description": "会员本人没有日活，没有圈层奖励(1:开启 0:关闭)", "type": "integer" }, + "originator_name": { + "description": "创始人名称", + "type": "string" + }, "originator_uid": { "description": "创始人uid", "type": "integer" @@ -3373,6 +3424,19 @@ const docTemplate = `{ } } }, + "md.GetVideoRewardResp": { + "type": "object", + "properties": { + "ecmp": { + "description": "当前 Ecpm 值", + "type": "string" + }, + "unit_price": { + "description": "单价", + "type": "string" + } + } + }, "md.ListCommunityDividendsReq": { "type": "object", "properties": { @@ -3940,6 +4004,14 @@ const docTemplate = `{ "md.SelectMemberResp": { "type": "object", "properties": { + "level_list": { + "description": "会员等级列表", + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + }, "list": { "description": "会员数据", "type": "array", @@ -3989,8 +4061,8 @@ const docTemplate = `{ "md.SetVideoRewardReq": { "type": "object", "properties": { - "ecmp": { - "description": "当前 Ecmp 值", + "ecpm": { + "description": "当前 Ecpm 值", "type": "string" }, "unit_price": { @@ -4348,11 +4420,10 @@ const docTemplate = `{ }, "reward_system": { "description": "圈层奖励", - "allOf": [ - { - "$ref": "#/definitions/md.RewardSystemStruct" - } - ] + "type": "array", + "items": { + "$ref": "#/definitions/md.RewardSystemStruct" + } }, "system_id": { "description": "该设置系统 ID", @@ -4935,7 +5006,7 @@ const docTemplate = `{ "type": "string" }, "register_type": { - "description": "注册类型(0.未知, 1.免验证码手机号注册，2.微信授权)", + "description": "注册类型(1:APP注册、2:H5注册)", "type": "integer" }, "sex": { diff --git a/docs/swagger.json b/docs/swagger.json index 47d497c..c4c04d0 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -712,7 +712,7 @@ }, "/api/institutionalManagement/eggEnergy/globalData/platformRevenueList": { "post": { - "description": "平台营收数据(获取)", + "description": "其他广告设置数据(获取)", "consumes": [ "application/json" ], @@ -722,7 +722,7 @@ "tags": [ "蛋蛋能量" ], - "summary": "制度中心-蛋蛋能量-平台营收数据(获取)", + "summary": "制度中心-蛋蛋能量-平台营收-其他广告设置数据(获取)", "parameters": [ { "type": "string", @@ -803,7 +803,7 @@ }, "/api/institutionalManagement/eggEnergy/platformRevenue/PlatformRevenueAdd": { "post": { - "description": "平台营收数据(新增)", + "description": "其他广告设置数据(新增)", "consumes": [ "application/json" ], @@ -813,7 +813,7 @@ "tags": [ "蛋蛋能量" ], - "summary": "制度中心-蛋蛋能量-平台营收数据(新增)", + "summary": "制度中心-蛋蛋能量-平台营收-其他广告设置数据(新增)", "parameters": [ { "type": "string", @@ -848,7 +848,54 @@ } } }, - "/api/institutionalManagement/eggEnergy/platformRevenue/SetVideoReward": { + "/api/institutionalManagement/eggEnergy/platformRevenue/getVideoReward": { + "post": { + "description": "激励视频(获取)", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "蛋蛋能量" + ], + "summary": "制度中心-蛋蛋能量-平台营收-激励视频(获取)", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + }, + { + "description": "落地页不填页大小默认20条数据", + "name": "req", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/md.SetVideoRewardReq" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/md.GetVideoRewardResp" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, + "/api/institutionalManagement/eggEnergy/platformRevenue/setVideoReward": { "post": { "description": "激励视频(设置)", "consumes": [ @@ -860,7 +907,7 @@ "tags": [ "蛋蛋能量" ], - "summary": "制度中心-蛋蛋能量-激励视频(设置)", + "summary": "制度中心-蛋蛋能量-平台营收-激励视频(设置)", "parameters": [ { "type": "string", @@ -3344,6 +3391,10 @@ "description": "会员本人没有日活，没有圈层奖励(1:开启 0:关闭)", "type": "integer" }, + "originator_name": { + "description": "创始人名称", + "type": "string" + }, "originator_uid": { "description": "创始人uid", "type": "integer" @@ -3366,6 +3417,19 @@ } } }, + "md.GetVideoRewardResp": { + "type": "object", + "properties": { + "ecmp": { + "description": "当前 Ecpm 值", + "type": "string" + }, + "unit_price": { + "description": "单价", + "type": "string" + } + } + }, "md.ListCommunityDividendsReq": { "type": "object", "properties": { @@ -3933,6 +3997,14 @@ "md.SelectMemberResp": { "type": "object", "properties": { + "level_list": { + "description": "会员等级列表", + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + }, "list": { "description": "会员数据", "type": "array", @@ -3982,8 +4054,8 @@ "md.SetVideoRewardReq": { "type": "object", "properties": { - "ecmp": { - "description": "当前 Ecmp 值", + "ecpm": { + "description": "当前 Ecpm 值", "type": "string" }, "unit_price": { @@ -4341,11 +4413,10 @@ }, "reward_system": { "description": "圈层奖励", - "allOf": [ - { - "$ref": "#/definitions/md.RewardSystemStruct" - } - ] + "type": "array", + "items": { + "$ref": "#/definitions/md.RewardSystemStruct" + } }, "system_id": { "description": "该设置系统 ID", @@ -4928,7 +4999,7 @@ "type": "string" }, "register_type": { - "description": "注册类型(0.未知, 1.免验证码手机号注册，2.微信授权)", + "description": "注册类型(1:APP注册、2:H5注册)", "type": "integer" }, "sex": { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index fc3b166..90fa6bf 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -825,6 +825,9 @@ definitions: is_self_active_get_team_revenue: description: 会员本人没有日活，没有圈层奖励(1:开启 0:关闭) type: integer + originator_name: + description: 创始人名称 + type: string originator_uid: description: 创始人uid type: integer @@ -841,6 +844,15 @@ definitions: description: xx天未活跃，处罚滑落 type: integer type: object + md.GetVideoRewardResp: + properties: + ecmp: + description: 当前 Ecpm 值 + type: string + unit_price: + description: 单价 + type: string + type: object md.ListCommunityDividendsReq: properties: end_at: @@ -1239,6 +1251,12 @@ definitions: type: object md.SelectMemberResp: properties: + level_list: + description: 会员等级列表 + items: + additionalProperties: true + type: object + type: array list: description: 会员数据 items: @@ -1272,8 +1290,8 @@ definitions: type: object md.SetVideoRewardReq: properties: - ecmp: - description: 当前 Ecmp 值 + ecpm: + description: 当前 Ecpm 值 type: string unit_price: description: 单价 @@ -1514,9 +1532,10 @@ definitions: - $ref: '#/definitions/md.PriceSettingStruct' description: 价格设置 reward_system: - allOf: - - $ref: '#/definitions/md.RewardSystemStruct' description: 圈层奖励 + items: + $ref: '#/definitions/md.RewardSystemStruct' + type: array system_id: description: 该设置系统 ID type: integer @@ -1931,7 +1950,7 @@ definitions: description: 注册时间起点 type: string register_type: - description: 注册类型(0.未知, 1.免验证码手机号注册，2.微信授权) + description: 注册类型(1:APP注册、2:H5注册) type: integer sex: description: 性别 @@ -2607,7 +2626,7 @@ paths: post: consumes: - application/json - description: 平台营收数据(获取) + description: 其他广告设置数据(获取) parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -2631,7 +2650,7 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 制度中心-蛋蛋能量-平台营收数据(获取) + summary: 制度中心-蛋蛋能量-平台营收-其他广告设置数据(获取) tags: - 蛋蛋能量 /api/institutionalManagement/eggEnergy/globalData/pointsCenterPriceCurve: @@ -2667,7 +2686,7 @@ paths: post: consumes: - application/json - description: 平台营收数据(新增) + description: 其他广告设置数据(新增) parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -2691,10 +2710,41 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 制度中心-蛋蛋能量-平台营收数据(新增) + summary: 制度中心-蛋蛋能量-平台营收-其他广告设置数据(新增) + tags: + - 蛋蛋能量 + /api/institutionalManagement/eggEnergy/platformRevenue/getVideoReward: + post: + consumes: + - application/json + description: 激励视频(获取) + parameters: + - description: 验证参数Bearer和token空格拼接 + in: header + name: Authorization + required: true + type: string + - description: 落地页不填页大小默认20条数据 + in: body + name: req + required: true + schema: + $ref: '#/definitions/md.SetVideoRewardReq' + produces: + - application/json + responses: + "200": + description: OK + schema: + $ref: '#/definitions/md.GetVideoRewardResp' + "400": + description: 具体错误 + schema: + $ref: '#/definitions/md.Response' + summary: 制度中心-蛋蛋能量-平台营收-激励视频(获取) tags: - 蛋蛋能量 - /api/institutionalManagement/eggEnergy/platformRevenue/SetVideoReward: + /api/institutionalManagement/eggEnergy/platformRevenue/setVideoReward: post: consumes: - application/json @@ -2722,7 +2772,7 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 制度中心-蛋蛋能量-激励视频(设置) + summary: 制度中心-蛋蛋能量-平台营收-激励视频(设置) tags: - 蛋蛋能量 /api/institutionalManagement/eggEnergy/updateBasic: