diff --git a/app/hdl/institutional_management/egg_energy/hdl_basic.go b/app/hdl/institutional_management/egg_energy/hdl_basic.go index f07c871..1429c52 100644 --- a/app/hdl/institutional_management/egg_energy/hdl_basic.go +++ b/app/hdl/institutional_management/egg_energy/hdl_basic.go @@ -10,6 +10,7 @@ import ( "code.fnuoos.com/EggPlanet/egg_system_rules.git/rule/egg_energy/enum" md2 "code.fnuoos.com/EggPlanet/egg_system_rules.git/rule/egg_energy/md" "errors" + "fmt" "github.com/gin-gonic/gin" "time" ) @@ -152,9 +153,9 @@ func GetEggEnergyBasic(c *gin.Context) { } // UpdateEggEnergyBasic -// @Summary 制度中心-蛋蛋能量-基础设置(获取) +// @Summary 制度中心-蛋蛋能量-基础设置(更新) // @Tags 蛋蛋能量 -// @Description 基础设置(获取) +// @Description 基础设置(更新) // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" @@ -217,17 +218,10 @@ func UpdateEggEnergyBasic(c *gin.Context) { // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" -// @Param req body md.GetEggCoreDataListReq false "起始时间请同时填写或同时不填" // @Success 200 {object} md.GetEggCoreDataListResp "具体数据" // @Failure 400 {object} md.Response "具体错误" -// @Router /api/institutionalManagement/eggEnergy/globalData/coreDataList [post] +// @Router /api/institutionalManagement/eggEnergy/globalData/coreDataList [get] func GetEggCoreDataList(c *gin.Context) { - var req *md.GetEggCoreDataListReq - if err1 := c.ShouldBindJSON(&req); err1 != nil { - e.OutErr(c, e.ERR_INVALID_ARGS, err1.Error()) - return - } - coreDataDb := implement.NewEggEnergyCoreDataDb(db.Db) coreData, err := coreDataDb.EggEnergyCoreDataGet() if err != nil { @@ -239,47 +233,127 @@ func GetEggCoreDataList(c *gin.Context) { return } - var startAt, endAt string - if req.StartAt == "" || req.EndAt == "" { - // 默认计算最近三十天 23 时的数据 - nowHour := time.Now().Hour() - if nowHour >= 23 { - req.EndAt = time.Now().Format("2006-01-02") - req.StartAt = time.Now().Add(-30 * 24 * time.Duration(time.Hour)).Format("2006-01-02") - } else { - req.EndAt = time.Now().Add(-24 * time.Duration(time.Hour)).Format("2006-01-02") - req.StartAt = time.Now().Add(-31 * 24 * time.Duration(time.Hour)).Format("2006-01-02") - } - } else { - startAt = req.StartAt - endAt = req.EndAt + sql := "SELECT SUM(amount) AS total, coin_id FORM `user_virtual_amount` GROUP BY (coin_id)" + results, err := db.Db.QueryString(sql) + if err != nil { + e.OutErr(c, e.ERR_DB_ORM, err.Error()) + return + } + coinsHoldMap := make(map[int]string) + for _, result := range results { + coinsHoldMap[utils.StrToInt(result["coin_id"])] = result["total"] } - hour := "23" - energyPriceDb := implement.NewEggEnergyPriceDb(db.Db) - priceList, err := energyPriceDb.EggEnergyPriceList(startAt, endAt, hour) + basicSettingDb := implement.NewEggEnergyBasicSettingDb(db.Db) + basicSetting, err := basicSettingDb.EggEnergyBasicSettingGetOne() if err != nil { e.OutErr(c, e.ERR_DB_ORM, err.Error()) return } - prices := make([]md.PriceNode, len(priceList)) - for i, price := range priceList { - prices[i].Date = price.Date - prices[i].Price = price.Price + userHoldTotalNumsMap := map[string]string{ + "PersonEggEnergyUserHoldTotal": coinsHoldMap[basicSetting.PersonEggEnergyCoinId], + "TeamEggEnergyUserHoldTotal": coinsHoldMap[basicSetting.TeamEggEnergyCoinId], + "PersonEggPointsUserHoldTotal": coinsHoldMap[basicSetting.PersonEggPointsCoinId], + "TeamEggPointsUserHoldTotal": coinsHoldMap[basicSetting.TeamEggPointsCoinId], + "ContributionUserHoldTotal": coinsHoldMap[basicSetting.ContributionCoinId], } resp := md.GetEggCoreDataListResp{ PlanetTotalValue: coreData.PlanetTotalValue, NowPrice: coreData.NowPrice, NowEnergyTotalNums: coreData.NowEnergyTotalNums, - // todo 计算用户持有总量 - UserHoldTotalNums: "", - Prices: prices, + UserHoldTotalNums: userHoldTotalNumsMap, } e.OutSuc(c, resp, nil) } +// GetPriceCurve +// @Summary 制度中心-蛋蛋能量-价格趋势(获取) +// @Tags 蛋蛋能量 +// @Description 价格趋势(获取) +// @Accept json +// @Produce json +// @param Authorization header string true "验证参数Bearer和token空格拼接" +// @Param kind query string false "1:按天 2：按小时 3：按周" +// @Success 200 {object} map[string]interface{} "具体数据" +// @Failure 400 {object} md.Response "具体错误" +// @Router /api/institutionalManagement/eggEnergy/globalData/pointsCenterPriceCurve [get] +func GetPriceCurve(c *gin.Context) { + kind := c.DefaultQuery("kind", "1") + now := time.Now() + + priceDb := implement.NewEggEnergyPriceDb(db.Db) + m, has, err := priceDb.EggEnergyPriceGetLastOne() + if err != nil { + e.OutErr(c, e.ERR_DB_ORM, err.Error()) + return + } + if has == false { + e.OutErr(c, e.ERR_NO_DATA, "未查询到数据") + return + } + + var yData []interface{} + var xData []interface{} + switch kind { + case "1": + var date = now.AddDate(0, 0, -30).Format("2006-01-02") + var sql = fmt.Sprintf("SELECT price,date FROM `egg_energy_price` WHERE HOUR = 23 AND DATE >= \"%s\" AND DATE != \"%s\" ORDER BY DATE ASC ", date, now.Format("2006-01-02")) + results, _ := db.Db.QueryString(sql) + for _, v := range results { + tmpDate := utils.TimeParseStd(v["date"]) + yData = append(yData, v["price"]) + xData = append(xData, tmpDate.Format("01-02")) + } + yData = append(yData, m.Price) + tmpDate := utils.TimeParseStd(m.Date) + xData = append(xData, tmpDate.Format("01-02")) + break + case "2": + for i := 29; i >= 1; i-- { + date := now.Add(-time.Hour * 4 * time.Duration(i)).Format("2006-01-02") + hour := now.Add(-time.Hour * 4 * time.Duration(i)).Hour() + var sql = "SELECT price,date,hour FROM `egg_energy_price` WHERE HOUR = %d AND DATE = \"%s\" " + sql = fmt.Sprintf(sql, hour, date) + results, _ := db.Db.QueryString(sql) + if results != nil { + //if results[0]["date"] != now.Format("2006-01-02") { + // continue + //} + yData = append(yData, results[0]["price"]) + xData = append(xData, results[0]["hour"]+":00") + } + } + yData = append(yData, m.Price) + xData = append(xData, m.Hour+":00") + break + case "3": + var nums = 29 + for i := nums; i >= 1; i-- { + var date = now.AddDate(0, 0, -7*i).Format("2006-01-02") + var sql = "SELECT price,date FROM `egg_energy_price` WHERE HOUR = 23 AND DATE = \"%s\" " + sql = fmt.Sprintf(sql, date) + results, _ := db.Db.QueryString(sql) + if results != nil { + tmpDate := utils.TimeParseStd(results[0]["date"]) + yData = append(yData, results[0]["price"]) + xData = append(xData, tmpDate.Format("01-02")) + } + } + yData = append(yData, m.Price) + tmpDate := utils.TimeParseStd(m.Date) + xData = append(xData, tmpDate.Format("01-02")) + break + } + + e.OutSuc(c, map[string]interface{}{ + "yData": yData, + "xData": xData, + }, nil) + return +} + // GetFundDataList // @Summary 制度中心-蛋蛋能量-新增数据列表(获取) // @Tags 蛋蛋能量 @@ -354,7 +428,7 @@ func GetFundDataList(c *gin.Context) { // @Param req body md.GetFundDataRecordListReq true "获取到的 system_id 以及分页信息" // @Success 200 {object} md.GetFundDataRecordListResp "具体数据" // @Failure 400 {object} md.Response "具体错误" -// @Router /api/institutionalManagement/eggEnergy/globalData/fundDataList [post] +// @Router /api/institutionalManagement/eggEnergy/globalData/fundDataRecordList [post] func GetFundDataRecordList(c *gin.Context) { var req *md.GetFundDataRecordListReq if err1 := c.ShouldBindJSON(&req); err1 != nil { diff --git a/app/md/institutional_management/egg_energy/md_basic.go b/app/md/institutional_management/egg_energy/md_basic.go index ec17027..73212c3 100644 --- a/app/md/institutional_management/egg_energy/md_basic.go +++ b/app/md/institutional_management/egg_energy/md_basic.go @@ -65,22 +65,11 @@ type UpdateEggEnergyBasicReq struct { NewUserIncentiveRules md.NewUserRewardRules `json:"new_user_incentive_rules"` // 新用户奖励规则 // 新用户奖励规则 } -type GetEggCoreDataListReq struct { - StartAt string `json:"start_at" example:"开始时间"` - EndAt string `json:"end_at" example:"结束时间"` -} - -type PriceNode struct { - Date string `json:"date" example:"日期"` - Price string `json:"price" example:"价格"` -} - 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" example:"用户持有总量"` // 用户持有总量 - Prices []PriceNode `json:"prices"` // 价格散点列表 + PlanetTotalValue string `json:"planet_total_value" example:"星球价值"` // 星球价值 + NowPrice string `json:"now_price" example:"当前价格"` // 当前价格 + NowEnergyTotalNums string `json:"now_energy_total_nums" example:"现行总量"` // 现行总量 + UserHoldTotalNums map[string]string `json:"user_hold_total_nums"` // 用户持有总量 } type GetFundDataListReq struct { diff --git a/app/router/router.go b/app/router/router.go index 0459896..6f42182 100644 --- a/app/router/router.go +++ b/app/router/router.go @@ -102,9 +102,10 @@ func rInstitutionalManagement(r *gin.RouterGroup) { //制度管理 } rEggGlobalData := rEggEnergy.Group("/globalData") { - rEggGlobalData.POST("/coreDataList", egg_energy.GetEggCoreDataList) + rEggGlobalData.GET("/coreDataList", egg_energy.GetEggCoreDataList) + rEggGlobalData.GET("/pointsCenterPriceCurve", egg_energy.GetPriceCurve) rEggGlobalData.POST("/fundDataList", egg_energy.GetFundDataList) - rEggGlobalData.POST("/fundDataListRecord", egg_energy.GetFundDataRecordList) + rEggGlobalData.POST("/fundDataRecordList", egg_energy.GetFundDataRecordList) } } } diff --git a/docs/docs.go b/docs/docs.go index 05dbe05..ac87c61 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -143,7 +143,7 @@ const docTemplate = `{ } }, "/api/institutionalManagement/eggEnergy/globalData/coreDataList": { - "post": { + "get": { "description": "数据概览(获取)", "consumes": [ "application/json" @@ -155,6 +155,44 @@ const docTemplate = `{ "蛋蛋能量" ], "summary": "制度中心-蛋蛋能量-数据概览(获取)", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + } + ], + "responses": { + "200": { + "description": "具体数据", + "schema": { + "$ref": "#/definitions/md.GetEggCoreDataListResp" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, + "/api/institutionalManagement/eggEnergy/globalData/fundDataList": { + "post": { + "description": "新增数据列表(获取)", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "蛋蛋能量" + ], + "summary": "制度中心-蛋蛋能量-新增数据列表(获取)", "parameters": [ { "type": "string", @@ -164,11 +202,12 @@ const docTemplate = `{ "required": true }, { - "description": "起始时间请同时填写或同时不填", + "description": "分页信息必填", "name": "req", "in": "body", + "required": true, "schema": { - "$ref": "#/definitions/md.GetEggCoreDataListReq" + "$ref": "#/definitions/md.GetFundDataListReq" } } ], @@ -176,7 +215,99 @@ const docTemplate = `{ "200": { "description": "具体数据", "schema": { - "$ref": "#/definitions/md.GetEggCoreDataListResp" + "$ref": "#/definitions/md.GetFundDataListResp" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, + "/api/institutionalManagement/eggEnergy/globalData/fundDataRecordList": { + "post": { + "description": "新增数据列表详情(查询)", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "蛋蛋能量" + ], + "summary": "制度中心-蛋蛋能量-新增数据列表详情(查询)", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + }, + { + "description": "获取到的 system_id 以及分页信息", + "name": "req", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/md.GetFundDataRecordListReq" + } + } + ], + "responses": { + "200": { + "description": "具体数据", + "schema": { + "$ref": "#/definitions/md.GetFundDataRecordListResp" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, + "/api/institutionalManagement/eggEnergy/globalData/pointsCenterPriceCurve": { + "get": { + "description": "价格趋势(获取)", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "蛋蛋能量" + ], + "summary": "制度中心-蛋蛋能量-价格趋势(获取)", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + }, + { + "type": "string", + "description": "1:按天 2：按小时 3：按周", + "name": "kind", + "in": "query" + } + ], + "responses": { + "200": { + "description": "具体数据", + "schema": { + "type": "object", + "additionalProperties": true } }, "400": { @@ -190,7 +321,7 @@ const docTemplate = `{ }, "/api/institutionalManagement/eggEnergy/updateBasic": { "post": { - "description": "基础设置(获取)", + "description": "基础设置(更新)", "consumes": [ "application/json" ], @@ -200,7 +331,7 @@ const docTemplate = `{ "tags": [ "蛋蛋能量" ], - "summary": "制度中心-蛋蛋能量-基础设置(获取)", + "summary": "制度中心-蛋蛋能量-基础设置(更新)", "parameters": [ { "type": "string", @@ -1566,6 +1697,78 @@ const docTemplate = `{ } } }, + "md.FundDataNode": { + "type": "object", + "properties": { + "balance_amount": { + "description": "余额", + "type": "string" + }, + "balance_times": { + "description": "剩余执行次数", + "type": "integer" + }, + "create_at": { + "description": "创建时间", + "type": "string" + }, + "hours": { + "description": "时长", + "type": "integer" + }, + "kind": { + "description": "种类(1:公司补贴 2:资方投资 3:市场期望)", + "type": "integer" + }, + "memo": { + "description": "备注", + "type": "string" + }, + "system_id": { + "type": "integer" + }, + "total_amount": { + "description": "金额", + "type": "string" + } + } + }, + "md.FundDataRecordNode": { + "type": "object", + "properties": { + "after_planet_total_value": { + "description": "执行后-星球价值", + "type": "string" + }, + "after_price": { + "description": "执行后-价格", + "type": "string" + }, + "balance_amount": { + "description": "余额", + "type": "string" + }, + "balance_times": { + "description": "剩余执行次数", + "type": "integer" + }, + "before_planet_total_value": { + "description": "执行前-星球价值", + "type": "string" + }, + "before_price": { + "description": "执行前-价格", + "type": "string" + }, + "create_at": { + "type": "string" + }, + "total_amount": { + "description": "金额", + "type": "string" + } + } + }, "md.GetActivePointsUserCoinFlowListReq": { "type": "object", "properties": { @@ -1691,19 +1894,6 @@ const docTemplate = `{ } } }, - "md.GetEggCoreDataListReq": { - "type": "object", - "properties": { - "end_at": { - "type": "string", - "example": "结束时间" - }, - "start_at": { - "type": "string", - "example": "开始时间" - } - } - }, "md.GetEggCoreDataListResp": { "type": "object", "properties": { @@ -1722,17 +1912,12 @@ const docTemplate = `{ "type": "string", "example": "星球价值" }, - "prices": { - "description": "价格散点列表", - "type": "array", - "items": { - "$ref": "#/definitions/md.PriceNode" - } - }, "user_hold_total_nums": { "description": "用户持有总量", - "type": "string", - "example": "用户持有总量" + "type": "object", + "additionalProperties": { + "type": "string" + } } } }, @@ -1771,6 +1956,14 @@ const docTemplate = `{ } ] }, + "new_user_incentive_rules": { + "description": "新用户奖励规则", + "allOf": [ + { + "$ref": "#/definitions/md.NewUserRewardRules" + } + ] + }, "price_setting": { "description": "价格设置", "allOf": [ @@ -1788,7 +1981,7 @@ const docTemplate = `{ ] }, "system_id": { - "description": "NewUserIncentiveRules md.\t\t\t\t\t\t\t\t\t\t\t\t\t // 新用户奖励规则", + "description": "该设置系统 ID", "type": "integer" }, "video_reward_setting": { @@ -1838,6 +2031,90 @@ const docTemplate = `{ } } }, + "md.GetFundDataListReq": { + "type": "object", + "properties": { + "end_at": { + "type": "string", + "example": "结束时间" + }, + "kind": { + "description": "数据类型", + "type": "integer" + }, + "limit": { + "description": "每页大小", + "type": "integer" + }, + "page": { + "description": "页数", + "type": "integer" + }, + "start_at": { + "type": "string", + "example": "开始时间" + } + } + }, + "md.GetFundDataListResp": { + "type": "object", + "properties": { + "kind_list": { + "description": "类型列表", + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + }, + "list": { + "description": "数据列表", + "type": "array", + "items": { + "$ref": "#/definitions/md.FundDataNode" + } + }, + "paginate": { + "description": "分页数据", + "allOf": [ + { + "$ref": "#/definitions/applet_app_md_institutional_management_egg_energy.Paginate" + } + ] + } + } + }, + "md.GetFundDataRecordListReq": { + "type": "object", + "properties": { + "limit": { + "description": "页面大小", + "type": "integer" + }, + "page": { + "description": "页数", + "type": "integer" + }, + "system_id": { + "description": "数据在系统中的 ID", + "type": "integer" + } + } + }, + "md.GetFundDataRecordListResp": { + "type": "object", + "properties": { + "list": { + "type": "array", + "items": { + "$ref": "#/definitions/md.FundDataRecordNode" + } + }, + "paginate": { + "$ref": "#/definitions/applet_app_md_institutional_management_egg_energy.Paginate" + } + } + }, "md.GetGreenEnergyUserCoinFlowListReq": { "type": "object", "properties": { @@ -2099,16 +2376,20 @@ const docTemplate = `{ } } }, - "md.PriceNode": { + "md.NewUserRewardRules": { "type": "object", "properties": { - "date": { - "type": "string", - "example": "日期" + "continue_days": { + "description": "连续x天", + "type": "integer" }, - "price": { - "type": "string", - "example": "价格" + "invite_user_reward_value": { + "description": "拉新用户奖励x个活跃积分", + "type": "integer" + }, + "reward_coefficient": { + "description": "奖励系数", + "type": "number" } } }, @@ -2306,6 +2587,14 @@ const docTemplate = `{ } ] }, + "new_user_incentive_rules": { + "description": "新用户奖励规则\t\t\t\t\t\t\t\t\t\t\t // 新用户奖励规则", + "allOf": [ + { + "$ref": "#/definitions/md.NewUserRewardRules" + } + ] + }, "price_setting": { "description": "价格设置", "allOf": [ diff --git a/docs/swagger.json b/docs/swagger.json index efa1355..a031f35 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -136,7 +136,7 @@ } }, "/api/institutionalManagement/eggEnergy/globalData/coreDataList": { - "post": { + "get": { "description": "数据概览(获取)", "consumes": [ "application/json" @@ -148,6 +148,44 @@ "蛋蛋能量" ], "summary": "制度中心-蛋蛋能量-数据概览(获取)", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + } + ], + "responses": { + "200": { + "description": "具体数据", + "schema": { + "$ref": "#/definitions/md.GetEggCoreDataListResp" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, + "/api/institutionalManagement/eggEnergy/globalData/fundDataList": { + "post": { + "description": "新增数据列表(获取)", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "蛋蛋能量" + ], + "summary": "制度中心-蛋蛋能量-新增数据列表(获取)", "parameters": [ { "type": "string", @@ -157,11 +195,12 @@ "required": true }, { - "description": "起始时间请同时填写或同时不填", + "description": "分页信息必填", "name": "req", "in": "body", + "required": true, "schema": { - "$ref": "#/definitions/md.GetEggCoreDataListReq" + "$ref": "#/definitions/md.GetFundDataListReq" } } ], @@ -169,7 +208,99 @@ "200": { "description": "具体数据", "schema": { - "$ref": "#/definitions/md.GetEggCoreDataListResp" + "$ref": "#/definitions/md.GetFundDataListResp" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, + "/api/institutionalManagement/eggEnergy/globalData/fundDataRecordList": { + "post": { + "description": "新增数据列表详情(查询)", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "蛋蛋能量" + ], + "summary": "制度中心-蛋蛋能量-新增数据列表详情(查询)", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + }, + { + "description": "获取到的 system_id 以及分页信息", + "name": "req", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/md.GetFundDataRecordListReq" + } + } + ], + "responses": { + "200": { + "description": "具体数据", + "schema": { + "$ref": "#/definitions/md.GetFundDataRecordListResp" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, + "/api/institutionalManagement/eggEnergy/globalData/pointsCenterPriceCurve": { + "get": { + "description": "价格趋势(获取)", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "蛋蛋能量" + ], + "summary": "制度中心-蛋蛋能量-价格趋势(获取)", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + }, + { + "type": "string", + "description": "1:按天 2：按小时 3：按周", + "name": "kind", + "in": "query" + } + ], + "responses": { + "200": { + "description": "具体数据", + "schema": { + "type": "object", + "additionalProperties": true } }, "400": { @@ -183,7 +314,7 @@ }, "/api/institutionalManagement/eggEnergy/updateBasic": { "post": { - "description": "基础设置(获取)", + "description": "基础设置(更新)", "consumes": [ "application/json" ], @@ -193,7 +324,7 @@ "tags": [ "蛋蛋能量" ], - "summary": "制度中心-蛋蛋能量-基础设置(获取)", + "summary": "制度中心-蛋蛋能量-基础设置(更新)", "parameters": [ { "type": "string", @@ -1559,6 +1690,78 @@ } } }, + "md.FundDataNode": { + "type": "object", + "properties": { + "balance_amount": { + "description": "余额", + "type": "string" + }, + "balance_times": { + "description": "剩余执行次数", + "type": "integer" + }, + "create_at": { + "description": "创建时间", + "type": "string" + }, + "hours": { + "description": "时长", + "type": "integer" + }, + "kind": { + "description": "种类(1:公司补贴 2:资方投资 3:市场期望)", + "type": "integer" + }, + "memo": { + "description": "备注", + "type": "string" + }, + "system_id": { + "type": "integer" + }, + "total_amount": { + "description": "金额", + "type": "string" + } + } + }, + "md.FundDataRecordNode": { + "type": "object", + "properties": { + "after_planet_total_value": { + "description": "执行后-星球价值", + "type": "string" + }, + "after_price": { + "description": "执行后-价格", + "type": "string" + }, + "balance_amount": { + "description": "余额", + "type": "string" + }, + "balance_times": { + "description": "剩余执行次数", + "type": "integer" + }, + "before_planet_total_value": { + "description": "执行前-星球价值", + "type": "string" + }, + "before_price": { + "description": "执行前-价格", + "type": "string" + }, + "create_at": { + "type": "string" + }, + "total_amount": { + "description": "金额", + "type": "string" + } + } + }, "md.GetActivePointsUserCoinFlowListReq": { "type": "object", "properties": { @@ -1684,19 +1887,6 @@ } } }, - "md.GetEggCoreDataListReq": { - "type": "object", - "properties": { - "end_at": { - "type": "string", - "example": "结束时间" - }, - "start_at": { - "type": "string", - "example": "开始时间" - } - } - }, "md.GetEggCoreDataListResp": { "type": "object", "properties": { @@ -1715,17 +1905,12 @@ "type": "string", "example": "星球价值" }, - "prices": { - "description": "价格散点列表", - "type": "array", - "items": { - "$ref": "#/definitions/md.PriceNode" - } - }, "user_hold_total_nums": { "description": "用户持有总量", - "type": "string", - "example": "用户持有总量" + "type": "object", + "additionalProperties": { + "type": "string" + } } } }, @@ -1764,6 +1949,14 @@ } ] }, + "new_user_incentive_rules": { + "description": "新用户奖励规则", + "allOf": [ + { + "$ref": "#/definitions/md.NewUserRewardRules" + } + ] + }, "price_setting": { "description": "价格设置", "allOf": [ @@ -1781,7 +1974,7 @@ ] }, "system_id": { - "description": "NewUserIncentiveRules md.\t\t\t\t\t\t\t\t\t\t\t\t\t // 新用户奖励规则", + "description": "该设置系统 ID", "type": "integer" }, "video_reward_setting": { @@ -1831,6 +2024,90 @@ } } }, + "md.GetFundDataListReq": { + "type": "object", + "properties": { + "end_at": { + "type": "string", + "example": "结束时间" + }, + "kind": { + "description": "数据类型", + "type": "integer" + }, + "limit": { + "description": "每页大小", + "type": "integer" + }, + "page": { + "description": "页数", + "type": "integer" + }, + "start_at": { + "type": "string", + "example": "开始时间" + } + } + }, + "md.GetFundDataListResp": { + "type": "object", + "properties": { + "kind_list": { + "description": "类型列表", + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + }, + "list": { + "description": "数据列表", + "type": "array", + "items": { + "$ref": "#/definitions/md.FundDataNode" + } + }, + "paginate": { + "description": "分页数据", + "allOf": [ + { + "$ref": "#/definitions/applet_app_md_institutional_management_egg_energy.Paginate" + } + ] + } + } + }, + "md.GetFundDataRecordListReq": { + "type": "object", + "properties": { + "limit": { + "description": "页面大小", + "type": "integer" + }, + "page": { + "description": "页数", + "type": "integer" + }, + "system_id": { + "description": "数据在系统中的 ID", + "type": "integer" + } + } + }, + "md.GetFundDataRecordListResp": { + "type": "object", + "properties": { + "list": { + "type": "array", + "items": { + "$ref": "#/definitions/md.FundDataRecordNode" + } + }, + "paginate": { + "$ref": "#/definitions/applet_app_md_institutional_management_egg_energy.Paginate" + } + } + }, "md.GetGreenEnergyUserCoinFlowListReq": { "type": "object", "properties": { @@ -2092,16 +2369,20 @@ } } }, - "md.PriceNode": { + "md.NewUserRewardRules": { "type": "object", "properties": { - "date": { - "type": "string", - "example": "日期" + "continue_days": { + "description": "连续x天", + "type": "integer" }, - "price": { - "type": "string", - "example": "价格" + "invite_user_reward_value": { + "description": "拉新用户奖励x个活跃积分", + "type": "integer" + }, + "reward_coefficient": { + "description": "奖励系数", + "type": "number" } } }, @@ -2299,6 +2580,14 @@ } ] }, + "new_user_incentive_rules": { + "description": "新用户奖励规则\t\t\t\t\t\t\t\t\t\t\t // 新用户奖励规则", + "allOf": [ + { + "$ref": "#/definitions/md.NewUserRewardRules" + } + ] + }, "price_setting": { "description": "价格设置", "allOf": [ diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 5e39faa..42db0cf 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -349,6 +349,58 @@ definitions: uid: type: integer type: object + md.FundDataNode: + properties: + balance_amount: + description: 余额 + type: string + balance_times: + description: 剩余执行次数 + type: integer + create_at: + description: 创建时间 + type: string + hours: + description: 时长 + type: integer + kind: + description: 种类(1:公司补贴 2:资方投资 3:市场期望) + type: integer + memo: + description: 备注 + type: string + system_id: + type: integer + total_amount: + description: 金额 + type: string + type: object + md.FundDataRecordNode: + properties: + after_planet_total_value: + description: 执行后-星球价值 + type: string + after_price: + description: 执行后-价格 + type: string + balance_amount: + description: 余额 + type: string + balance_times: + description: 剩余执行次数 + type: integer + before_planet_total_value: + description: 执行前-星球价值 + type: string + before_price: + description: 执行前-价格 + type: string + create_at: + type: string + total_amount: + description: 金额 + type: string + type: object md.GetActivePointsUserCoinFlowListReq: properties: coin_id: @@ -435,15 +487,6 @@ definitions: description: 持有该类型用户数 type: integer type: object - md.GetEggCoreDataListReq: - properties: - end_at: - example: 结束时间 - type: string - start_at: - example: 开始时间 - type: string - type: object md.GetEggCoreDataListResp: properties: now_energy_total_nums: @@ -458,15 +501,11 @@ definitions: description: 星球价值 example: 星球价值 type: string - prices: - description: 价格散点列表 - items: - $ref: '#/definitions/md.PriceNode' - type: array user_hold_total_nums: + additionalProperties: + type: string description: 用户持有总量 - example: 用户持有总量 - type: string + type: object type: object md.GetEggEnergyBasicResp: properties: @@ -486,6 +525,10 @@ definitions: allOf: - $ref: '#/definitions/md.ExchangeRulesStruct' description: 兑换规则 + new_user_incentive_rules: + allOf: + - $ref: '#/definitions/md.NewUserRewardRules' + description: 新用户奖励规则 price_setting: allOf: - $ref: '#/definitions/md.PriceSettingStruct' @@ -495,7 +538,7 @@ definitions: - $ref: '#/definitions/md.RewardSystemStruct' description: 圈层奖励 system_id: - description: "NewUserIncentiveRules md.\t\t\t\t\t\t\t\t\t\t\t\t\t // 新用户奖励规则" + description: 该设置系统 ID type: integer video_reward_setting: allOf: @@ -526,6 +569,63 @@ definitions: - $ref: '#/definitions/applet_app_md_institutional_management_public_platoon.Paginate' description: 分页信息 type: object + md.GetFundDataListReq: + properties: + end_at: + example: 结束时间 + type: string + kind: + description: 数据类型 + type: integer + limit: + description: 每页大小 + type: integer + page: + description: 页数 + type: integer + start_at: + example: 开始时间 + type: string + type: object + md.GetFundDataListResp: + properties: + kind_list: + description: 类型列表 + items: + additionalProperties: true + type: object + type: array + list: + description: 数据列表 + items: + $ref: '#/definitions/md.FundDataNode' + type: array + paginate: + allOf: + - $ref: '#/definitions/applet_app_md_institutional_management_egg_energy.Paginate' + description: 分页数据 + type: object + md.GetFundDataRecordListReq: + properties: + limit: + description: 页面大小 + type: integer + page: + description: 页数 + type: integer + system_id: + description: 数据在系统中的 ID + type: integer + type: object + md.GetFundDataRecordListResp: + properties: + list: + items: + $ref: '#/definitions/md.FundDataRecordNode' + type: array + paginate: + $ref: '#/definitions/applet_app_md_institutional_management_egg_energy.Paginate' + type: object md.GetGreenEnergyUserCoinFlowListReq: properties: coin_id: @@ -706,14 +806,17 @@ definitions: token: type: string type: object - md.PriceNode: + md.NewUserRewardRules: properties: - date: - example: 日期 - type: string - price: - example: 价格 - type: string + continue_days: + description: 连续x天 + type: integer + invite_user_reward_value: + description: 拉新用户奖励x个活跃积分 + type: integer + reward_coefficient: + description: 奖励系数 + type: number type: object md.PriceSettingStruct: properties: @@ -844,6 +947,10 @@ definitions: allOf: - $ref: '#/definitions/md.ExchangeRulesStruct' description: 兑换规则 + new_user_incentive_rules: + allOf: + - $ref: '#/definitions/md.NewUserRewardRules' + description: "新用户奖励规则\t\t\t\t\t\t\t\t\t\t\t // 新用户奖励规则" price_setting: allOf: - $ref: '#/definitions/md.PriceSettingStruct' @@ -1101,7 +1208,7 @@ paths: tags: - 蛋蛋能量 /api/institutionalManagement/eggEnergy/globalData/coreDataList: - post: + get: consumes: - application/json description: 数据概览(获取) @@ -1111,30 +1218,117 @@ paths: name: Authorization required: true type: string - - description: 起始时间请同时填写或同时不填 + produces: + - application/json + responses: + "200": + description: 具体数据 + schema: + $ref: '#/definitions/md.GetEggCoreDataListResp' + "400": + description: 具体错误 + schema: + $ref: '#/definitions/md.Response' + summary: 制度中心-蛋蛋能量-数据概览(获取) + tags: + - 蛋蛋能量 + /api/institutionalManagement/eggEnergy/globalData/fundDataList: + post: + consumes: + - application/json + description: 新增数据列表(获取) + parameters: + - description: 验证参数Bearer和token空格拼接 + in: header + name: Authorization + required: true + type: string + - description: 分页信息必填 in: body name: req + required: true schema: - $ref: '#/definitions/md.GetEggCoreDataListReq' + $ref: '#/definitions/md.GetFundDataListReq' produces: - application/json responses: "200": description: 具体数据 schema: - $ref: '#/definitions/md.GetEggCoreDataListResp' + $ref: '#/definitions/md.GetFundDataListResp' "400": description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 制度中心-蛋蛋能量-数据概览(获取) + summary: 制度中心-蛋蛋能量-新增数据列表(获取) + tags: + - 蛋蛋能量 + /api/institutionalManagement/eggEnergy/globalData/fundDataRecordList: + post: + consumes: + - application/json + description: 新增数据列表详情(查询) + parameters: + - description: 验证参数Bearer和token空格拼接 + in: header + name: Authorization + required: true + type: string + - description: 获取到的 system_id 以及分页信息 + in: body + name: req + required: true + schema: + $ref: '#/definitions/md.GetFundDataRecordListReq' + produces: + - application/json + responses: + "200": + description: 具体数据 + schema: + $ref: '#/definitions/md.GetFundDataRecordListResp' + "400": + description: 具体错误 + schema: + $ref: '#/definitions/md.Response' + summary: 制度中心-蛋蛋能量-新增数据列表详情(查询) + tags: + - 蛋蛋能量 + /api/institutionalManagement/eggEnergy/globalData/pointsCenterPriceCurve: + get: + consumes: + - application/json + description: 价格趋势(获取) + parameters: + - description: 验证参数Bearer和token空格拼接 + in: header + name: Authorization + required: true + type: string + - description: 1:按天 2：按小时 3：按周 + in: query + name: kind + type: string + produces: + - application/json + responses: + "200": + description: 具体数据 + schema: + additionalProperties: true + type: object + "400": + description: 具体错误 + schema: + $ref: '#/definitions/md.Response' + summary: 制度中心-蛋蛋能量-价格趋势(获取) tags: - 蛋蛋能量 /api/institutionalManagement/eggEnergy/updateBasic: post: consumes: - application/json - description: 基础设置(获取) + description: 基础设置(更新) parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -1158,7 +1352,7 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 制度中心-蛋蛋能量-基础设置(获取) + summary: 制度中心-蛋蛋能量-基础设置(更新) tags: - 蛋蛋能量 /api/institutionalManagement/eggEnergy/userCoin/activePointsUserCoinFlowList: