From d0942f48d17c57287e52244e9c66982432c1f2c5 Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Thu, 28 Nov 2024 19:58:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=87=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/md/md_article.go | 1 + app/svc/article/svc_list.go | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/app/md/md_article.go b/app/md/md_article.go index a77a6ac..fcac0ce 100644 --- a/app/md/md_article.go +++ b/app/md/md_article.go @@ -34,6 +34,7 @@ type ArticleListReq struct { type ArticleListResp struct { Total int64 `json:"total"` SelectData []map[string]interface{} `json:"select_data"` + CateData []map[string]interface{} `json:"cate_data"` List []ArticleList `json:"list"` } type ArticleList struct { diff --git a/app/svc/article/svc_list.go b/app/svc/article/svc_list.go index eaffad5..e2e87cf 100644 --- a/app/svc/article/svc_list.go +++ b/app/svc/article/svc_list.go @@ -40,10 +40,22 @@ func List(c *gin.Context) { } list = append(list, tmp1) } + tmp["list"] = list } resp.SelectData = append(resp.SelectData, tmp) } } + resp.CateData = make([]map[string]interface{}, 0) + cate, _, _ := NewArticleCateDb.FindArticleCateAndTotalPid("1", "100") + if cate != nil { + for _, v := range *cate { + list := make([]map[string]string, 0) + tmp := map[string]interface{}{ + "name": v.Name, "value": utils.IntToStr(v.Id), "list": list, + } + resp.CateData = append(resp.CateData, tmp) + } + } if notice != nil { for _, v := range *notice { tmp := md.ArticleList{ From 84aa91edb4fe0aeb31621a7c2206590088035b0a Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Thu, 28 Nov 2024 20:04:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BA=91=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/md/md_cloud_bundle.go | 1 + 1 file changed, 1 insertion(+) diff --git a/app/md/md_cloud_bundle.go b/app/md/md_cloud_bundle.go index 22d13b3..bfeedc4 100644 --- a/app/md/md_cloud_bundle.go +++ b/app/md/md_cloud_bundle.go @@ -89,6 +89,7 @@ type CloudBundleVersion struct { type CloudBundleVersionMap struct { Type string `json:"type"` Name string `json:"name"` + Img string `json:"img"` } type CloudBundleVersionResp struct { Version []CloudBundleVersion `json:"version"` From 03fb8e08cca59d2c6e31dcba222c2fe7124d9d10 Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Fri, 29 Nov 2024 14:02:52 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/hdl/user_real_name/hdl_base.go | 35 +++ app/hdl/user_real_name/hdl_list.go | 36 +++ app/md/md_article.go | 1 + app/md/md_user_real_name.go | 33 +++ app/router/router.go | 10 +- app/svc/article/svc_list.go | 2 + app/svc/user_real_name/svc_base.go | 31 +++ app/svc/user_real_name/svc_list.go | 82 +++++++ docs/docs.go | 348 ++++++++++++++++++++++++++++- docs/swagger.json | 343 +++++++++++++++++++++++++++- docs/swagger.yaml | 224 ++++++++++++++++++- go.mod | 2 +- 12 files changed, 1124 insertions(+), 23 deletions(-) create mode 100644 app/hdl/user_real_name/hdl_base.go create mode 100644 app/hdl/user_real_name/hdl_list.go create mode 100644 app/md/md_user_real_name.go create mode 100644 app/svc/user_real_name/svc_base.go create mode 100644 app/svc/user_real_name/svc_list.go diff --git a/app/hdl/user_real_name/hdl_base.go b/app/hdl/user_real_name/hdl_base.go new file mode 100644 index 0000000..8e33c21 --- /dev/null +++ b/app/hdl/user_real_name/hdl_base.go @@ -0,0 +1,35 @@ +package user_real_name + +import ( + "applet/app/svc/user_real_name" + "github.com/gin-gonic/gin" +) + +// Base +// @Summary 会员中心-实名认证-基本配置 +// @Tags 会员中心 +// @Description 会员中心-实名认证 +// @Accept json +// @Produce json +// @param Authorization header string true "验证参数Bearer和token空格拼接" +// @Success 200 {object} md.UserRealNameBaseResp "具体数据" +// @Failure 400 {object} md.Response "具体错误" +// @Router /api/userRealName/base [get] +func Base(c *gin.Context) { + user_real_name.Base(c) +} + +// BaseSave +// @Summary 会员中心-实名认证-基本配置保存 +// @Tags 会员中心 +// @Description 会员中心-实名认证-基本配置保存 +// @Accept json +// @Produce json +// @param Authorization header string true "验证参数Bearer和token空格拼接" +// @Param req body md.UserRealNameBaseResp true "(分页信息必填)" +// @Success 200 {string} "具体数据" +// @Failure 400 {object} md.Response "具体错误" +// @Router /api/userRealName/base/save [post] +func BaseSave(c *gin.Context) { + user_real_name.BaseSave(c) +} diff --git a/app/hdl/user_real_name/hdl_list.go b/app/hdl/user_real_name/hdl_list.go new file mode 100644 index 0000000..c95b75e --- /dev/null +++ b/app/hdl/user_real_name/hdl_list.go @@ -0,0 +1,36 @@ +package user_real_name + +import ( + "applet/app/svc/user_real_name" + "github.com/gin-gonic/gin" +) + +// List +// @Summary 会员中心-实名认证列表 +// @Tags 会员中心 +// @Description 会员中心-实名认证列表 +// @Accept json +// @Produce json +// @param Authorization header string true "验证参数Bearer和token空格拼接" +// @Param req body md.UserRealNameReq true "(分页信息必填)" +// @Success 200 {object} md.UserRealNameResp "具体数据" +// @Failure 400 {object} md.Response "具体错误" +// @Router /api/userRealName/list [post] +func List(c *gin.Context) { + user_real_name.List(c) +} + +// Save +// @Summary 会员中心-实名认证-修改认证状态 +// @Tags 会员中心 +// @Description 会员中心-修改认证状态 +// @Accept json +// @Produce json +// @param Authorization header string true "验证参数Bearer和token空格拼接" +// @Param req body md.UserRealNameSaveReq true "(分页信息必填)" +// @Success 200 {string} "具体数据" +// @Failure 400 {object} md.Response "具体错误" +// @Router /api/userRealName/save [post] +func Save(c *gin.Context) { + user_real_name.Save(c) +} diff --git a/app/md/md_article.go b/app/md/md_article.go index fcac0ce..d96b76e 100644 --- a/app/md/md_article.go +++ b/app/md/md_article.go @@ -47,6 +47,7 @@ type ArticleList struct { CoverUrl string `json:"cover_url"` IsShow string `json:"is_show"` Sort string `json:"sort"` + Url string `json:"url"` } type ArticleSaveReq struct { Id string `json:"id"` diff --git a/app/md/md_user_real_name.go b/app/md/md_user_real_name.go new file mode 100644 index 0000000..a0ef134 --- /dev/null +++ b/app/md/md_user_real_name.go @@ -0,0 +1,33 @@ +package md + +type UserRealNameReq struct { + Uid string `json:"uid"` + Phone string `json:"phone"` + Name string `json:"name"` + IdNo string `json:"id_no"` + Page string `json:"page"` + Limit string `json:"limit"` + State string `json:"state"` +} +type UserRealNameResp struct { + Total int64 `json:"total"` + List []UserRealName `json:"list"` + SelectData []map[string]string `json:"select_data"` +} +type UserRealName struct { + Id string `json:"id"` + Uid string `json:"uid"` + Phone string `json:"phone"` + Name string `json:"name"` + IdNo string `json:"id_no"` + PayState string `json:"pay_state" example:"0未支付 1已支付"` + State string `json:"state" example:"0未申请 1申请通过 3申请失败"` +} +type UserRealNameSaveReq struct { + Id string `json:"id"` + State string `json:"state"` +} + +type UserRealNameBaseResp struct { + UserRealNameMoney string `json:"user_real_name_money" example:"实名认证费用" ` +} diff --git a/app/router/router.go b/app/router/router.go index ba57fa3..cbd4fbd 100644 --- a/app/router/router.go +++ b/app/router/router.go @@ -17,6 +17,7 @@ import ( "applet/app/hdl/notice" "applet/app/hdl/setCenter/oss/aliyun" "applet/app/hdl/user_feedback" + "applet/app/hdl/user_real_name" "applet/app/mw" _ "applet/docs" "github.com/gin-gonic/gin" @@ -83,7 +84,8 @@ func route(r *gin.RouterGroup) { rNotice(r.Group("/notice")) rArticle(r.Group("/article")) rUserFeedback(r.Group("/userFeedback")) - rCloudBundle(r.Group("/cloudBundle")) //云打包 + rCloudBundle(r.Group("/cloudBundle")) //云打包 + rUserRealName(r.Group("/userRealName")) //实名认证 } func rSettCenter(r *gin.RouterGroup) { //设置中心 @@ -175,6 +177,12 @@ func rCloudBundle(r *gin.RouterGroup) { //云打包 r.GET("/version/base", cloud_bundle.VersionBase) r.POST("/version/base/save", cloud_bundle.VersionBaseSave) } +func rUserRealName(r *gin.RouterGroup) { //实名认证 + r.POST("/list", user_real_name.List) + r.POST("/save", user_real_name.Save) + r.GET("/base", user_real_name.Base) + r.POST("/base/save", user_real_name.BaseSave) +} func rInstitutionalManagement(r *gin.RouterGroup) { //制度管理 rPublicPlatoon := r.Group("/publicPlatoon") //公排设置 { diff --git a/app/svc/article/svc_list.go b/app/svc/article/svc_list.go index e2e87cf..c7001fa 100644 --- a/app/svc/article/svc_list.go +++ b/app/svc/article/svc_list.go @@ -8,6 +8,7 @@ import ( "applet/app/utils" "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" "code.fnuoos.com/EggPlanet/egg_models.git/src/model" + "fmt" "github.com/gin-gonic/gin" "time" ) @@ -68,6 +69,7 @@ func List(c *gin.Context) { Sort: utils.IntToStr(v.Sort), IsShow: utils.IntToStr(v.IsShow), Pid: utils.IntToStr(v.Pid), + Url: fmt.Sprintf("%s%s?id=%s&is_hide=0", svc.GetSysCfgStr("wap_host"), "/#/pages/course-detail-page/course-detail-page", utils.AnyToString(v.Id)), } noticeList = append(noticeList, tmp) } diff --git a/app/svc/user_real_name/svc_base.go b/app/svc/user_real_name/svc_base.go new file mode 100644 index 0000000..2b0e480 --- /dev/null +++ b/app/svc/user_real_name/svc_base.go @@ -0,0 +1,31 @@ +package user_real_name + +import ( + "applet/app/db" + "applet/app/e" + "applet/app/md" + "applet/app/svc" + "applet/app/utils/cache" + "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" + "github.com/gin-gonic/gin" +) + +func Base(c *gin.Context) { + res := md.UserRealNameBaseResp{ + UserRealNameMoney: svc.GetSysCfgStr("user_real_name_money"), + } + e.OutSuc(c, res, nil) + return +} +func BaseSave(c *gin.Context) { + var req md.UserRealNameBaseResp + if err := c.ShouldBindJSON(&req); err != nil { + e.OutErr(c, e.ERR_INVALID_ARGS, err) + return + } + conn := cache.GetPool().Get() + cfgDb := implement.NewSysCfgDb(db.Db, conn) + cfgDb.SysCfgUpdate("user_real_name_money", req.UserRealNameMoney) + e.OutSuc(c, "success", nil) + return +} diff --git a/app/svc/user_real_name/svc_list.go b/app/svc/user_real_name/svc_list.go new file mode 100644 index 0000000..eaeeee9 --- /dev/null +++ b/app/svc/user_real_name/svc_list.go @@ -0,0 +1,82 @@ +package user_real_name + +import ( + "applet/app/db" + "applet/app/e" + "applet/app/md" + "applet/app/utils" + "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" + "github.com/gin-gonic/gin" +) + +func List(c *gin.Context) { + var req *md.UserRealNameReq + if err := c.ShouldBindJSON(&req); err != nil { + e.OutErr(c, e.ERR_INVALID_ARGS, err) + return + } + if req.Phone != "" { + req.Uid = "-1" + NewUserDb := implement.NewUserDb(db.Db) + user, _ := NewUserDb.UserGetOneByParams(map[string]interface{}{ + "key": "phone", + "value": req.Phone, + }) + if user != nil { + req.Uid = utils.Int64ToStr(user.Id) + } + } + var resp md.UserRealNameResp + noticeList := make([]md.UserRealName, 0) + NewCloudBundleDb := implement.NewUserRealNameAuthDb(db.Db) + notice, total, _ := NewCloudBundleDb.FindRealNameAndTotal(req.Page, req.Limit, req.Uid, req.Name, req.IdNo, req.State) + resp.Total = total + if notice != nil { + NewUserDb := implement.NewUserDb(db.Db) + for _, v := range *notice { + phone := "" + user, _ := NewUserDb.UserGetOneByParams(map[string]interface{}{ + "key": "id", + "value": v.Uid, + }) + if user != nil { + phone = user.Phone + } + tmp := md.UserRealName{ + Id: utils.IntToStr(v.Id), + Uid: utils.IntToStr(v.Uid), + Phone: phone, + Name: v.RealName, + IdNo: v.CardNo, + PayState: utils.IntToStr(v.IsPay), + State: utils.IntToStr(v.State), + } + noticeList = append(noticeList, tmp) + } + } + resp.List = noticeList + resp.SelectData = []map[string]string{ + {"value": "0", "name": "未认证"}, + {"value": "1", "name": "认证成功"}, + {"value": "2", "name": "认证失败"}, + } + e.OutSuc(c, resp, nil) + return +} +func Save(c *gin.Context) { + var req *md.UserRealNameSaveReq + if err := c.ShouldBindJSON(&req); err != nil { + e.OutErr(c, e.ERR_INVALID_ARGS, err) + return + } + NewUserRealNameAuthDb := implement.NewUserRealNameAuthDb(db.Db) + data, _ := NewUserRealNameAuthDb.GetRealNameAuthById(req.Id) + if data == nil { + e.OutErr(c, 400, e.NewErr(400, "记录不存在")) + return + } + data.State = utils.StrToInt(req.State) + db.Db.Where("id=?", data.Id).Cols("state").Update(data) + e.OutSuc(c, "success", nil) + return +} diff --git a/docs/docs.go b/docs/docs.go index ea58414..9e11f5e 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -1,4 +1,5 @@ -// Package docs Code generated by swaggo/swag. DO NOT EDIT +// Code generated by swaggo/swag. DO NOT EDIT. + package docs import "github.com/swaggo/swag" @@ -1352,7 +1353,9 @@ const docTemplate = `{ "name": "req", "in": "body", "required": true, - "schema": {} + "schema": { + "type": "object" + } } ], "responses": { @@ -6242,6 +6245,185 @@ const docTemplate = `{ } } }, + "/api/userRealName/base": { + "get": { + "description": "会员中心-实名认证", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "会员中心" + ], + "summary": "会员中心-实名认证-基本配置", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + } + ], + "responses": { + "200": { + "description": "具体数据", + "schema": { + "$ref": "#/definitions/md.UserRealNameBaseResp" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, + "/api/userRealName/base/save": { + "post": { + "description": "会员中心-实名认证-基本配置保存", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "会员中心" + ], + "summary": "会员中心-实名认证-基本配置保存", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + }, + { + "description": "(分页信息必填)", + "name": "req", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/md.UserRealNameBaseResp" + } + } + ], + "responses": { + "200": { + "description": "具体数据", + "schema": { + "type": "string" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, + "/api/userRealName/list": { + "post": { + "description": "会员中心-实名认证列表", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "会员中心" + ], + "summary": "会员中心-实名认证列表", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + }, + { + "description": "(分页信息必填)", + "name": "req", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/md.UserRealNameReq" + } + } + ], + "responses": { + "200": { + "description": "具体数据", + "schema": { + "$ref": "#/definitions/md.UserRealNameResp" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, + "/api/userRealName/save": { + "post": { + "description": "会员中心-修改认证状态", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "会员中心" + ], + "summary": "会员中心-实名认证-修改认证状态", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + }, + { + "description": "(分页信息必填)", + "name": "req", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/md.UserRealNameSaveReq" + } + } + ], + "responses": { + "200": { + "description": "具体数据", + "schema": { + "type": "string" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, "/api/user_feedback/cate/del": { "post": { "description": "分类列表-分类删除", @@ -7287,6 +7469,9 @@ const docTemplate = `{ }, "title": { "type": "string" + }, + "url": { + "type": "string" } } }, @@ -7306,6 +7491,13 @@ const docTemplate = `{ "md.ArticleListResp": { "type": "object", "properties": { + "cate_data": { + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + }, "list": { "type": "array", "items": { @@ -7757,6 +7949,9 @@ const docTemplate = `{ "md.CloudBundleVersionMap": { "type": "object", "properties": { + "img": { + "type": "string" + }, "name": { "type": "string" }, @@ -9215,7 +9410,11 @@ const docTemplate = `{ }, "withdraw_fee_set": { "description": "提现手续费设置", - "type": "string" + "allOf": [ + { + "$ref": "#/definitions/md.WithdrawFeeSetStruct" + } + ] }, "withdraw_multiple_limit": { "description": "提现倍数限制（0为不限制，金额限制倍数才可以申请提现 )", @@ -9227,7 +9426,11 @@ const docTemplate = `{ }, "withdraw_time_interval": { "description": "提现时段", - "type": "string" + "allOf": [ + { + "$ref": "#/definitions/md.WithdrawTimeIntervalStruct" + } + ] }, "withdraw_type": { "description": "提现方式(1:支付宝 2:微信)", @@ -11106,7 +11309,11 @@ const docTemplate = `{ }, "withdraw_fee_set": { "description": "提现手续费设置", - "type": "string" + "allOf": [ + { + "$ref": "#/definitions/md.WithdrawFeeSetStruct" + } + ] }, "withdraw_multiple_limit": { "description": "提现倍数限制（0为不限制，金额限制倍数才可以申请提现 )", @@ -11117,8 +11324,12 @@ const docTemplate = `{ "type": "integer" }, "withdraw_time_interval": { - "description": "提现时段", - "type": "string" + "description": "提现时段(startAt xx:xx endAt xx:xx)", + "allOf": [ + { + "$ref": "#/definitions/md.WithdrawTimeIntervalStruct" + } + ] }, "withdraw_type": { "description": "提现方式(1:支付宝 2:微信)", @@ -12058,6 +12269,103 @@ const docTemplate = `{ } } }, + "md.UserRealName": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "id_no": { + "type": "string" + }, + "name": { + "type": "string" + }, + "pay_state": { + "type": "string", + "example": "0未支付 1已支付" + }, + "phone": { + "type": "string" + }, + "state": { + "type": "string", + "example": "0未申请 1申请通过 3申请失败" + }, + "uid": { + "type": "string" + } + } + }, + "md.UserRealNameBaseResp": { + "type": "object", + "properties": { + "user_real_name_money": { + "type": "string", + "example": "实名认证费用" + } + } + }, + "md.UserRealNameReq": { + "type": "object", + "properties": { + "id_no": { + "type": "string" + }, + "limit": { + "type": "string" + }, + "name": { + "type": "string" + }, + "page": { + "type": "string" + }, + "phone": { + "type": "string" + }, + "state": { + "type": "string" + }, + "uid": { + "type": "string" + } + } + }, + "md.UserRealNameResp": { + "type": "object", + "properties": { + "list": { + "type": "array", + "items": { + "$ref": "#/definitions/md.UserRealName" + } + }, + "select_data": { + "type": "array", + "items": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + }, + "total": { + "type": "integer" + } + } + }, + "md.UserRealNameSaveReq": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "state": { + "type": "string" + } + } + }, "md.UserVirtualCoinFlow": { "type": "object", "properties": { @@ -12238,6 +12546,19 @@ const docTemplate = `{ } } }, + "md.WithdrawFeeSetStruct": { + "type": "object", + "properties": { + "duration": { + "description": "类型 (1.固定金额 2.固定比例)", + "type": "integer" + }, + "value": { + "description": "具体值", + "type": "integer" + } + } + }, "md.WithdrawFrequencySettingStruct": { "type": "object", "properties": { @@ -12254,6 +12575,17 @@ const docTemplate = `{ } } }, + "md.WithdrawTimeIntervalStruct": { + "type": "object", + "properties": { + "end_at": { + "type": "string" + }, + "start_at": { + "type": "string" + } + } + }, "model.EggEnergyUserEggIndexWeight": { "type": "object", "properties": { @@ -12385,8 +12717,6 @@ var SwaggerInfo = &swag.Spec{ Description: "管理后台接口文档", InfoInstanceName: "swagger", SwaggerTemplate: docTemplate, - LeftDelim: "{{", - RightDelim: "}}", } func init() { diff --git a/docs/swagger.json b/docs/swagger.json index 816c9a4..856d75a 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -1345,7 +1345,9 @@ "name": "req", "in": "body", "required": true, - "schema": {} + "schema": { + "type": "object" + } } ], "responses": { @@ -6235,6 +6237,185 @@ } } }, + "/api/userRealName/base": { + "get": { + "description": "会员中心-实名认证", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "会员中心" + ], + "summary": "会员中心-实名认证-基本配置", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + } + ], + "responses": { + "200": { + "description": "具体数据", + "schema": { + "$ref": "#/definitions/md.UserRealNameBaseResp" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, + "/api/userRealName/base/save": { + "post": { + "description": "会员中心-实名认证-基本配置保存", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "会员中心" + ], + "summary": "会员中心-实名认证-基本配置保存", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + }, + { + "description": "(分页信息必填)", + "name": "req", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/md.UserRealNameBaseResp" + } + } + ], + "responses": { + "200": { + "description": "具体数据", + "schema": { + "type": "string" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, + "/api/userRealName/list": { + "post": { + "description": "会员中心-实名认证列表", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "会员中心" + ], + "summary": "会员中心-实名认证列表", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + }, + { + "description": "(分页信息必填)", + "name": "req", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/md.UserRealNameReq" + } + } + ], + "responses": { + "200": { + "description": "具体数据", + "schema": { + "$ref": "#/definitions/md.UserRealNameResp" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, + "/api/userRealName/save": { + "post": { + "description": "会员中心-修改认证状态", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "会员中心" + ], + "summary": "会员中心-实名认证-修改认证状态", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + }, + { + "description": "(分页信息必填)", + "name": "req", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/md.UserRealNameSaveReq" + } + } + ], + "responses": { + "200": { + "description": "具体数据", + "schema": { + "type": "string" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, "/api/user_feedback/cate/del": { "post": { "description": "分类列表-分类删除", @@ -7280,6 +7461,9 @@ }, "title": { "type": "string" + }, + "url": { + "type": "string" } } }, @@ -7299,6 +7483,13 @@ "md.ArticleListResp": { "type": "object", "properties": { + "cate_data": { + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + }, "list": { "type": "array", "items": { @@ -7750,6 +7941,9 @@ "md.CloudBundleVersionMap": { "type": "object", "properties": { + "img": { + "type": "string" + }, "name": { "type": "string" }, @@ -9208,7 +9402,11 @@ }, "withdraw_fee_set": { "description": "提现手续费设置", - "type": "string" + "allOf": [ + { + "$ref": "#/definitions/md.WithdrawFeeSetStruct" + } + ] }, "withdraw_multiple_limit": { "description": "提现倍数限制（0为不限制，金额限制倍数才可以申请提现 )", @@ -9220,7 +9418,11 @@ }, "withdraw_time_interval": { "description": "提现时段", - "type": "string" + "allOf": [ + { + "$ref": "#/definitions/md.WithdrawTimeIntervalStruct" + } + ] }, "withdraw_type": { "description": "提现方式(1:支付宝 2:微信)", @@ -11099,7 +11301,11 @@ }, "withdraw_fee_set": { "description": "提现手续费设置", - "type": "string" + "allOf": [ + { + "$ref": "#/definitions/md.WithdrawFeeSetStruct" + } + ] }, "withdraw_multiple_limit": { "description": "提现倍数限制（0为不限制，金额限制倍数才可以申请提现 )", @@ -11110,8 +11316,12 @@ "type": "integer" }, "withdraw_time_interval": { - "description": "提现时段", - "type": "string" + "description": "提现时段(startAt xx:xx endAt xx:xx)", + "allOf": [ + { + "$ref": "#/definitions/md.WithdrawTimeIntervalStruct" + } + ] }, "withdraw_type": { "description": "提现方式(1:支付宝 2:微信)", @@ -12051,6 +12261,103 @@ } } }, + "md.UserRealName": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "id_no": { + "type": "string" + }, + "name": { + "type": "string" + }, + "pay_state": { + "type": "string", + "example": "0未支付 1已支付" + }, + "phone": { + "type": "string" + }, + "state": { + "type": "string", + "example": "0未申请 1申请通过 3申请失败" + }, + "uid": { + "type": "string" + } + } + }, + "md.UserRealNameBaseResp": { + "type": "object", + "properties": { + "user_real_name_money": { + "type": "string", + "example": "实名认证费用" + } + } + }, + "md.UserRealNameReq": { + "type": "object", + "properties": { + "id_no": { + "type": "string" + }, + "limit": { + "type": "string" + }, + "name": { + "type": "string" + }, + "page": { + "type": "string" + }, + "phone": { + "type": "string" + }, + "state": { + "type": "string" + }, + "uid": { + "type": "string" + } + } + }, + "md.UserRealNameResp": { + "type": "object", + "properties": { + "list": { + "type": "array", + "items": { + "$ref": "#/definitions/md.UserRealName" + } + }, + "select_data": { + "type": "array", + "items": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + }, + "total": { + "type": "integer" + } + } + }, + "md.UserRealNameSaveReq": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "state": { + "type": "string" + } + } + }, "md.UserVirtualCoinFlow": { "type": "object", "properties": { @@ -12231,6 +12538,19 @@ } } }, + "md.WithdrawFeeSetStruct": { + "type": "object", + "properties": { + "duration": { + "description": "类型 (1.固定金额 2.固定比例)", + "type": "integer" + }, + "value": { + "description": "具体值", + "type": "integer" + } + } + }, "md.WithdrawFrequencySettingStruct": { "type": "object", "properties": { @@ -12247,6 +12567,17 @@ } } }, + "md.WithdrawTimeIntervalStruct": { + "type": "object", + "properties": { + "end_at": { + "type": "string" + }, + "start_at": { + "type": "string" + } + } + }, "model.EggEnergyUserEggIndexWeight": { "type": "object", "properties": { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index f1bf1a2..6688418 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -658,6 +658,8 @@ definitions: type: string title: type: string + url: + type: string type: object md.ArticleListReq: properties: @@ -670,6 +672,11 @@ definitions: type: object md.ArticleListResp: properties: + cate_data: + items: + additionalProperties: true + type: object + type: array list: items: $ref: '#/definitions/md.ArticleList' @@ -978,6 +985,8 @@ definitions: type: object md.CloudBundleVersionMap: properties: + img: + type: string name: type: string type: @@ -1990,8 +1999,9 @@ definitions: description: 提现金额限制(0为不限制，大于等于该金额才可以申请提现 ) type: string withdraw_fee_set: + allOf: + - $ref: '#/definitions/md.WithdrawFeeSetStruct' description: 提现手续费设置 - type: string withdraw_multiple_limit: description: 提现倍数限制（0为不限制，金额限制倍数才可以申请提现 ) type: string @@ -1999,8 +2009,9 @@ definitions: description: 提现次数限制(对应上方设置周期，0为不限制，失败、驳回不计数 ) type: integer withdraw_time_interval: + allOf: + - $ref: '#/definitions/md.WithdrawTimeIntervalStruct' description: 提现时段 - type: string withdraw_type: description: 提现方式(1:支付宝 2:微信) type: integer @@ -3313,8 +3324,9 @@ definitions: description: 提现金额限制(0为不限制，大于等于该金额才可以申请提现 ) type: string withdraw_fee_set: + allOf: + - $ref: '#/definitions/md.WithdrawFeeSetStruct' description: 提现手续费设置 - type: string withdraw_multiple_limit: description: 提现倍数限制（0为不限制，金额限制倍数才可以申请提现 ) type: string @@ -3322,8 +3334,9 @@ definitions: description: 提现次数限制(对应上方设置周期，0为不限制，失败、驳回不计数 ) type: integer withdraw_time_interval: - description: 提现时段 - type: string + allOf: + - $ref: '#/definitions/md.WithdrawTimeIntervalStruct' + description: 提现时段(startAt xx:xx endAt xx:xx) withdraw_type: description: 提现方式(1:支付宝 2:微信) type: integer @@ -3980,6 +3993,70 @@ definitions: description: 微信号 type: string type: object + md.UserRealName: + properties: + id: + type: string + id_no: + type: string + name: + type: string + pay_state: + example: 0未支付 1已支付 + type: string + phone: + type: string + state: + example: 0未申请 1申请通过 3申请失败 + type: string + uid: + type: string + type: object + md.UserRealNameBaseResp: + properties: + user_real_name_money: + example: 实名认证费用 + type: string + type: object + md.UserRealNameReq: + properties: + id_no: + type: string + limit: + type: string + name: + type: string + page: + type: string + phone: + type: string + state: + type: string + uid: + type: string + type: object + md.UserRealNameResp: + properties: + list: + items: + $ref: '#/definitions/md.UserRealName' + type: array + select_data: + items: + additionalProperties: + type: string + type: object + type: array + total: + type: integer + type: object + md.UserRealNameSaveReq: + properties: + id: + type: string + state: + type: string + type: object md.UserVirtualCoinFlow: properties: after_amount: @@ -4107,6 +4184,15 @@ definitions: example: 货币类型名称 type: string type: object + md.WithdrawFeeSetStruct: + properties: + duration: + description: 类型 (1.固定金额 2.固定比例) + type: integer + value: + description: 具体值 + type: integer + type: object md.WithdrawFrequencySettingStruct: properties: duration: @@ -4118,6 +4204,13 @@ definitions: type: string type: array type: object + md.WithdrawTimeIntervalStruct: + properties: + end_at: + type: string + start_at: + type: string + type: object model.EggEnergyUserEggIndexWeight: properties: account_balance_exchange_egg_energy_nums: @@ -5078,7 +5171,8 @@ paths: in: body name: req required: true - schema: {} + schema: + type: object produces: - application/json responses: @@ -8375,6 +8469,124 @@ paths: summary: 用户反馈-反馈列表-沟通发送 tags: - 消息中心 + /api/userRealName/base: + get: + consumes: + - application/json + description: 会员中心-实名认证 + parameters: + - description: 验证参数Bearer和token空格拼接 + in: header + name: Authorization + required: true + type: string + produces: + - application/json + responses: + "200": + description: 具体数据 + schema: + $ref: '#/definitions/md.UserRealNameBaseResp' + "400": + description: 具体错误 + schema: + $ref: '#/definitions/md.Response' + summary: 会员中心-实名认证-基本配置 + tags: + - 会员中心 + /api/userRealName/base/save: + 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.UserRealNameBaseResp' + produces: + - application/json + responses: + "200": + description: 具体数据 + schema: + type: string + "400": + description: 具体错误 + schema: + $ref: '#/definitions/md.Response' + summary: 会员中心-实名认证-基本配置保存 + tags: + - 会员中心 + /api/userRealName/list: + 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.UserRealNameReq' + produces: + - application/json + responses: + "200": + description: 具体数据 + schema: + $ref: '#/definitions/md.UserRealNameResp' + "400": + description: 具体错误 + schema: + $ref: '#/definitions/md.Response' + summary: 会员中心-实名认证列表 + tags: + - 会员中心 + /api/userRealName/save: + 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.UserRealNameSaveReq' + produces: + - application/json + responses: + "200": + description: 具体数据 + schema: + type: string + "400": + description: 具体错误 + schema: + $ref: '#/definitions/md.Response' + summary: 会员中心-实名认证-修改认证状态 + tags: + - 会员中心 securityDefinitions: MasterID: in: header diff --git a/go.mod b/go.mod index 098d5ba..cf4724c 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( ) require ( - code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241128102555-fc839292d728 + code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241129055230-e9cbd65b0bfb code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241128115447-7e6ca58dd32a 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 From a4e7a9dd77df641e691a23daa94111932f3ee6d2 Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Fri, 29 Nov 2024 14:06:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/hdl/user_real_name/hdl_base.go | 12 ++++++------ app/hdl/user_real_name/hdl_list.go | 12 ++++++------ docs/docs.go | 24 ++++++++++++------------ docs/swagger.json | 24 ++++++++++++------------ docs/swagger.yaml | 24 ++++++++++++------------ 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/app/hdl/user_real_name/hdl_base.go b/app/hdl/user_real_name/hdl_base.go index 8e33c21..e25902e 100644 --- a/app/hdl/user_real_name/hdl_base.go +++ b/app/hdl/user_real_name/hdl_base.go @@ -6,9 +6,9 @@ import ( ) // Base -// @Summary 会员中心-实名认证-基本配置 -// @Tags 会员中心 -// @Description 会员中心-实名认证 +// @Summary 基本设置-实名认证-基本配置 +// @Tags 基本设置 +// @Description 基本设置-实名认证 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" @@ -20,9 +20,9 @@ func Base(c *gin.Context) { } // BaseSave -// @Summary 会员中心-实名认证-基本配置保存 -// @Tags 会员中心 -// @Description 会员中心-实名认证-基本配置保存 +// @Summary 基本设置-实名认证-基本配置保存 +// @Tags 基本设置 +// @Description 基本设置-实名认证-基本配置保存 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" diff --git a/app/hdl/user_real_name/hdl_list.go b/app/hdl/user_real_name/hdl_list.go index c95b75e..9717b95 100644 --- a/app/hdl/user_real_name/hdl_list.go +++ b/app/hdl/user_real_name/hdl_list.go @@ -6,9 +6,9 @@ import ( ) // List -// @Summary 会员中心-实名认证列表 -// @Tags 会员中心 -// @Description 会员中心-实名认证列表 +// @Summary 基本设置-实名认证列表 +// @Tags 基本设置 +// @Description 基本设置-实名认证列表 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" @@ -21,9 +21,9 @@ func List(c *gin.Context) { } // Save -// @Summary 会员中心-实名认证-修改认证状态 -// @Tags 会员中心 -// @Description 会员中心-修改认证状态 +// @Summary 基本设置-实名认证-修改认证状态 +// @Tags 基本设置 +// @Description 基本设置-修改认证状态 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" diff --git a/docs/docs.go b/docs/docs.go index 9e11f5e..2ad5538 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -6247,7 +6247,7 @@ const docTemplate = `{ }, "/api/userRealName/base": { "get": { - "description": "会员中心-实名认证", + "description": "基本设置-实名认证", "consumes": [ "application/json" ], @@ -6255,9 +6255,9 @@ const docTemplate = `{ "application/json" ], "tags": [ - "会员中心" + "基本设置" ], - "summary": "会员中心-实名认证-基本配置", + "summary": "基本设置-实名认证-基本配置", "parameters": [ { "type": "string", @@ -6285,7 +6285,7 @@ const docTemplate = `{ }, "/api/userRealName/base/save": { "post": { - "description": "会员中心-实名认证-基本配置保存", + "description": "基本设置-实名认证-基本配置保存", "consumes": [ "application/json" ], @@ -6293,9 +6293,9 @@ const docTemplate = `{ "application/json" ], "tags": [ - "会员中心" + "基本设置" ], - "summary": "会员中心-实名认证-基本配置保存", + "summary": "基本设置-实名认证-基本配置保存", "parameters": [ { "type": "string", @@ -6332,7 +6332,7 @@ const docTemplate = `{ }, "/api/userRealName/list": { "post": { - "description": "会员中心-实名认证列表", + "description": "基本设置-实名认证列表", "consumes": [ "application/json" ], @@ -6340,9 +6340,9 @@ const docTemplate = `{ "application/json" ], "tags": [ - "会员中心" + "基本设置" ], - "summary": "会员中心-实名认证列表", + "summary": "基本设置-实名认证列表", "parameters": [ { "type": "string", @@ -6379,7 +6379,7 @@ const docTemplate = `{ }, "/api/userRealName/save": { "post": { - "description": "会员中心-修改认证状态", + "description": "基本设置-修改认证状态", "consumes": [ "application/json" ], @@ -6387,9 +6387,9 @@ const docTemplate = `{ "application/json" ], "tags": [ - "会员中心" + "基本设置" ], - "summary": "会员中心-实名认证-修改认证状态", + "summary": "基本设置-实名认证-修改认证状态", "parameters": [ { "type": "string", diff --git a/docs/swagger.json b/docs/swagger.json index 856d75a..75f3f54 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -6239,7 +6239,7 @@ }, "/api/userRealName/base": { "get": { - "description": "会员中心-实名认证", + "description": "基本设置-实名认证", "consumes": [ "application/json" ], @@ -6247,9 +6247,9 @@ "application/json" ], "tags": [ - "会员中心" + "基本设置" ], - "summary": "会员中心-实名认证-基本配置", + "summary": "基本设置-实名认证-基本配置", "parameters": [ { "type": "string", @@ -6277,7 +6277,7 @@ }, "/api/userRealName/base/save": { "post": { - "description": "会员中心-实名认证-基本配置保存", + "description": "基本设置-实名认证-基本配置保存", "consumes": [ "application/json" ], @@ -6285,9 +6285,9 @@ "application/json" ], "tags": [ - "会员中心" + "基本设置" ], - "summary": "会员中心-实名认证-基本配置保存", + "summary": "基本设置-实名认证-基本配置保存", "parameters": [ { "type": "string", @@ -6324,7 +6324,7 @@ }, "/api/userRealName/list": { "post": { - "description": "会员中心-实名认证列表", + "description": "基本设置-实名认证列表", "consumes": [ "application/json" ], @@ -6332,9 +6332,9 @@ "application/json" ], "tags": [ - "会员中心" + "基本设置" ], - "summary": "会员中心-实名认证列表", + "summary": "基本设置-实名认证列表", "parameters": [ { "type": "string", @@ -6371,7 +6371,7 @@ }, "/api/userRealName/save": { "post": { - "description": "会员中心-修改认证状态", + "description": "基本设置-修改认证状态", "consumes": [ "application/json" ], @@ -6379,9 +6379,9 @@ "application/json" ], "tags": [ - "会员中心" + "基本设置" ], - "summary": "会员中心-实名认证-修改认证状态", + "summary": "基本设置-实名认证-修改认证状态", "parameters": [ { "type": "string", diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 6688418..8562dd5 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -8473,7 +8473,7 @@ paths: get: consumes: - application/json - description: 会员中心-实名认证 + description: 基本设置-实名认证 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -8491,14 +8491,14 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 会员中心-实名认证-基本配置 + summary: 基本设置-实名认证-基本配置 tags: - - 会员中心 + - 基本设置 /api/userRealName/base/save: post: consumes: - application/json - description: 会员中心-实名认证-基本配置保存 + description: 基本设置-实名认证-基本配置保存 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -8522,14 +8522,14 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 会员中心-实名认证-基本配置保存 + summary: 基本设置-实名认证-基本配置保存 tags: - - 会员中心 + - 基本设置 /api/userRealName/list: post: consumes: - application/json - description: 会员中心-实名认证列表 + description: 基本设置-实名认证列表 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -8553,14 +8553,14 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 会员中心-实名认证列表 + summary: 基本设置-实名认证列表 tags: - - 会员中心 + - 基本设置 /api/userRealName/save: post: consumes: - application/json - description: 会员中心-修改认证状态 + description: 基本设置-修改认证状态 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -8584,9 +8584,9 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 会员中心-实名认证-修改认证状态 + summary: 基本设置-实名认证-修改认证状态 tags: - - 会员中心 + - 基本设置 securityDefinitions: MasterID: in: header From 9cc704c93e28b3278d73acd752381334a0d9c981 Mon Sep 17 00:00:00 2001 From: shenjiachi Date: Fri, 29 Nov 2024 14:15:04 +0800 Subject: [PATCH 5/5] update --- app/router/router.go | 2 +- docs/docs.go | 60 ++++++++++++++++++++++++++++++++++++++++---- docs/swagger.json | 60 ++++++++++++++++++++++++++++++++++++++++---- docs/swagger.yaml | 37 +++++++++++++++++++++++---- go.mod | 6 +++-- 5 files changed, 147 insertions(+), 18 deletions(-) diff --git a/app/router/router.go b/app/router/router.go index ba57fa3..b76be16 100644 --- a/app/router/router.go +++ b/app/router/router.go @@ -322,7 +322,7 @@ func rFinancialCenter(r *gin.RouterGroup) { { rWithdraw.GET("/setting", financial_center.GetWithdrawSetting) rWithdraw.POST("/updateWithdrawSetting", financial_center.UpdateWithdrawSetting) - rWithdraw.GET("/applyList", financial_center.GetWithdrawApplyList) + rWithdraw.POST("/applyList", financial_center.GetWithdrawApplyList) } } diff --git a/docs/docs.go b/docs/docs.go index ea58414..bb6e9d1 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -7306,6 +7306,13 @@ const docTemplate = `{ "md.ArticleListResp": { "type": "object", "properties": { + "cate_data": { + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + }, "list": { "type": "array", "items": { @@ -7757,6 +7764,9 @@ const docTemplate = `{ "md.CloudBundleVersionMap": { "type": "object", "properties": { + "img": { + "type": "string" + }, "name": { "type": "string" }, @@ -9215,7 +9225,11 @@ const docTemplate = `{ }, "withdraw_fee_set": { "description": "提现手续费设置", - "type": "string" + "allOf": [ + { + "$ref": "#/definitions/md.WithdrawFeeSetStruct" + } + ] }, "withdraw_multiple_limit": { "description": "提现倍数限制（0为不限制，金额限制倍数才可以申请提现 )", @@ -9227,7 +9241,11 @@ const docTemplate = `{ }, "withdraw_time_interval": { "description": "提现时段", - "type": "string" + "allOf": [ + { + "$ref": "#/definitions/md.WithdrawTimeIntervalStruct" + } + ] }, "withdraw_type": { "description": "提现方式(1:支付宝 2:微信)", @@ -11106,7 +11124,11 @@ const docTemplate = `{ }, "withdraw_fee_set": { "description": "提现手续费设置", - "type": "string" + "allOf": [ + { + "$ref": "#/definitions/md.WithdrawFeeSetStruct" + } + ] }, "withdraw_multiple_limit": { "description": "提现倍数限制（0为不限制，金额限制倍数才可以申请提现 )", @@ -11117,8 +11139,12 @@ const docTemplate = `{ "type": "integer" }, "withdraw_time_interval": { - "description": "提现时段", - "type": "string" + "description": "提现时段(startAt xx:xx endAt xx:xx)", + "allOf": [ + { + "$ref": "#/definitions/md.WithdrawTimeIntervalStruct" + } + ] }, "withdraw_type": { "description": "提现方式(1:支付宝 2:微信)", @@ -12238,6 +12264,19 @@ const docTemplate = `{ } } }, + "md.WithdrawFeeSetStruct": { + "type": "object", + "properties": { + "duration": { + "description": "类型 (1.固定金额 2.固定比例)", + "type": "integer" + }, + "value": { + "description": "具体值", + "type": "integer" + } + } + }, "md.WithdrawFrequencySettingStruct": { "type": "object", "properties": { @@ -12254,6 +12293,17 @@ const docTemplate = `{ } } }, + "md.WithdrawTimeIntervalStruct": { + "type": "object", + "properties": { + "end_at": { + "type": "string" + }, + "start_at": { + "type": "string" + } + } + }, "model.EggEnergyUserEggIndexWeight": { "type": "object", "properties": { diff --git a/docs/swagger.json b/docs/swagger.json index 816c9a4..822ed2a 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -7299,6 +7299,13 @@ "md.ArticleListResp": { "type": "object", "properties": { + "cate_data": { + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + }, "list": { "type": "array", "items": { @@ -7750,6 +7757,9 @@ "md.CloudBundleVersionMap": { "type": "object", "properties": { + "img": { + "type": "string" + }, "name": { "type": "string" }, @@ -9208,7 +9218,11 @@ }, "withdraw_fee_set": { "description": "提现手续费设置", - "type": "string" + "allOf": [ + { + "$ref": "#/definitions/md.WithdrawFeeSetStruct" + } + ] }, "withdraw_multiple_limit": { "description": "提现倍数限制（0为不限制，金额限制倍数才可以申请提现 )", @@ -9220,7 +9234,11 @@ }, "withdraw_time_interval": { "description": "提现时段", - "type": "string" + "allOf": [ + { + "$ref": "#/definitions/md.WithdrawTimeIntervalStruct" + } + ] }, "withdraw_type": { "description": "提现方式(1:支付宝 2:微信)", @@ -11099,7 +11117,11 @@ }, "withdraw_fee_set": { "description": "提现手续费设置", - "type": "string" + "allOf": [ + { + "$ref": "#/definitions/md.WithdrawFeeSetStruct" + } + ] }, "withdraw_multiple_limit": { "description": "提现倍数限制（0为不限制，金额限制倍数才可以申请提现 )", @@ -11110,8 +11132,12 @@ "type": "integer" }, "withdraw_time_interval": { - "description": "提现时段", - "type": "string" + "description": "提现时段(startAt xx:xx endAt xx:xx)", + "allOf": [ + { + "$ref": "#/definitions/md.WithdrawTimeIntervalStruct" + } + ] }, "withdraw_type": { "description": "提现方式(1:支付宝 2:微信)", @@ -12231,6 +12257,19 @@ } } }, + "md.WithdrawFeeSetStruct": { + "type": "object", + "properties": { + "duration": { + "description": "类型 (1.固定金额 2.固定比例)", + "type": "integer" + }, + "value": { + "description": "具体值", + "type": "integer" + } + } + }, "md.WithdrawFrequencySettingStruct": { "type": "object", "properties": { @@ -12247,6 +12286,17 @@ } } }, + "md.WithdrawTimeIntervalStruct": { + "type": "object", + "properties": { + "end_at": { + "type": "string" + }, + "start_at": { + "type": "string" + } + } + }, "model.EggEnergyUserEggIndexWeight": { "type": "object", "properties": { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index f1bf1a2..7afc043 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -670,6 +670,11 @@ definitions: type: object md.ArticleListResp: properties: + cate_data: + items: + additionalProperties: true + type: object + type: array list: items: $ref: '#/definitions/md.ArticleList' @@ -978,6 +983,8 @@ definitions: type: object md.CloudBundleVersionMap: properties: + img: + type: string name: type: string type: @@ -1990,8 +1997,9 @@ definitions: description: 提现金额限制(0为不限制，大于等于该金额才可以申请提现 ) type: string withdraw_fee_set: + allOf: + - $ref: '#/definitions/md.WithdrawFeeSetStruct' description: 提现手续费设置 - type: string withdraw_multiple_limit: description: 提现倍数限制（0为不限制，金额限制倍数才可以申请提现 ) type: string @@ -1999,8 +2007,9 @@ definitions: description: 提现次数限制(对应上方设置周期，0为不限制，失败、驳回不计数 ) type: integer withdraw_time_interval: + allOf: + - $ref: '#/definitions/md.WithdrawTimeIntervalStruct' description: 提现时段 - type: string withdraw_type: description: 提现方式(1:支付宝 2:微信) type: integer @@ -3313,8 +3322,9 @@ definitions: description: 提现金额限制(0为不限制，大于等于该金额才可以申请提现 ) type: string withdraw_fee_set: + allOf: + - $ref: '#/definitions/md.WithdrawFeeSetStruct' description: 提现手续费设置 - type: string withdraw_multiple_limit: description: 提现倍数限制（0为不限制，金额限制倍数才可以申请提现 ) type: string @@ -3322,8 +3332,9 @@ definitions: description: 提现次数限制(对应上方设置周期，0为不限制，失败、驳回不计数 ) type: integer withdraw_time_interval: - description: 提现时段 - type: string + allOf: + - $ref: '#/definitions/md.WithdrawTimeIntervalStruct' + description: 提现时段(startAt xx:xx endAt xx:xx) withdraw_type: description: 提现方式(1:支付宝 2:微信) type: integer @@ -4107,6 +4118,15 @@ definitions: example: 货币类型名称 type: string type: object + md.WithdrawFeeSetStruct: + properties: + duration: + description: 类型 (1.固定金额 2.固定比例) + type: integer + value: + description: 具体值 + type: integer + type: object md.WithdrawFrequencySettingStruct: properties: duration: @@ -4118,6 +4138,13 @@ definitions: type: string type: array type: object + md.WithdrawTimeIntervalStruct: + properties: + end_at: + type: string + start_at: + type: string + type: object model.EggEnergyUserEggIndexWeight: properties: account_balance_exchange_egg_energy_nums: diff --git a/go.mod b/go.mod index 098d5ba..e6b2748 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module applet -go 1.19 +go 1.21 + +toolchain go1.21.13 // replace code.fnuoos.com/EggPlanet/egg_models.git => E:/company/Egg/egg_models @@ -33,7 +35,7 @@ require ( require ( code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241128102555-fc839292d728 - code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241128115447-7e6ca58dd32a + code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241129035757-6f22c03e842e 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