From b7197b83ac795d10372cafc4abda78cd38007d82 Mon Sep 17 00:00:00 2001 From: shenjiachi Date: Mon, 25 Nov 2024 19:40:47 +0800 Subject: [PATCH] add Contribution Value Basic Setting --- .../egg_energy/hdl_contribution_value.go | 91 ++++ app/md/financial_center/md_withdraw.go | 2 +- .../egg_energy/md_contribution_value.go | 17 + app/router/router.go | 9 +- app/svc/financial_center/svc_withdraw.go | 6 +- docs/docs.go | 389 ++++++++++++++++++ docs/swagger.json | 389 ++++++++++++++++++ docs/swagger.yaml | 272 ++++++++++++ go.mod | 2 +- 9 files changed, 1172 insertions(+), 5 deletions(-) create mode 100644 app/hdl/institutional_management/egg_energy/hdl_contribution_value.go create mode 100644 app/md/institutional_management/egg_energy/md_contribution_value.go diff --git a/app/hdl/institutional_management/egg_energy/hdl_contribution_value.go b/app/hdl/institutional_management/egg_energy/hdl_contribution_value.go new file mode 100644 index 0000000..1ac70e8 --- /dev/null +++ b/app/hdl/institutional_management/egg_energy/hdl_contribution_value.go @@ -0,0 +1,91 @@ +package egg_energy + +import ( + "applet/app/db" + "applet/app/e" + md "applet/app/md/institutional_management/egg_energy" + "applet/app/utils" + "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" + "code.fnuoos.com/EggPlanet/egg_models.git/src/model" + "github.com/gin-gonic/gin" +) + +// GetContributionValueBasicSetting +// @Summary 制度中心-蛋蛋能量-贡献值-基础设置(获取) +// @Tags 贡献值 +// @Description 贡献值-基础设置(获取) +// @Accept json +// @Produce json +// @param Authorization header string true "验证参数Bearer和token空格拼接" +// @Success 200 {object} md.GetContributionValueBasicSettingResp "具体数据" +// @Failure 400 {object} md.Response "具体错误" +// @Router /api/institutionalManagement/eggEnergy/contributionValue/basic [get] +func GetContributionValueBasicSetting(c *gin.Context) { + settingDb := implement.NewContributionValueBasicSettingDb(db.Db) + setting, err := settingDb.ContributionValueBasicSettingGetOne() + if err != nil { + e.OutErr(c, e.ERR_DB_ORM, nil) + return + } + if setting == nil { + m := model.ContributionValueBasicSetting{ + PostingDynamicLiked: 0, + PostingCommentLiked: 0, + HandOutRedPackage: 0, + PublishCreation: 0, + } + _, err := settingDb.ContributionValueBasicSettingInsert(&m) + if err != nil { + e.OutErr(c, e.ERR_DB_ORM, nil) + return + } + setting, err = settingDb.ContributionValueBasicSettingGetOne() + if err != nil { + e.OutErr(c, e.ERR_DB_ORM, nil) + return + } + } + resp := md.GetContributionValueBasicSettingResp{ + Id: setting.Id, + PostingDynamicLiked: setting.PostingDynamicLiked, + PostingCommentLiked: setting.PostingCommentLiked, + HandOutRedPackage: setting.HandOutRedPackage, + PublishCreation: setting.PublishCreation, + } + + e.OutSuc(c, resp, nil) +} + +// UpdateContributionValueBasicSetting +// @Summary 制度中心-蛋蛋能量-贡献值-基础设置(更新) +// @Tags 贡献值 +// @Description 贡献值-基础设置(更新) +// @Accept json +// @Produce json +// @param Authorization header string true "验证参数Bearer和token空格拼接" +// @Param req body md.UpdateContributionValueBasicSettingReq true "id 必填" +// @Success 200 {int} "修改数据条数" +// @Failure 400 {object} md.Response "具体错误" +// @Router /api/institutionalManagement/eggEnergy/contributionValue/updateBasic [POST] +func UpdateContributionValueBasicSetting(c *gin.Context) { + var req *md.UpdateContributionValueBasicSettingReq + if err1 := c.ShouldBindJSON(&req); err1 != nil { + e.OutErr(c, e.ERR_INVALID_ARGS, err1.Error()) + return + } + + settingDb := implement.NewContributionValueBasicSettingDb(db.Db) + m := model.ContributionValueBasicSetting{ + PostingDynamicLiked: utils.StrToInt(req.PostingDynamicLiked), + PostingCommentLiked: utils.StrToInt(req.PostingCommentLiked), + HandOutRedPackage: utils.StrToInt(req.HandOutRedPackage), + PublishCreation: utils.StrToInt(req.PublishCreation), + } + forceColumns := []string{"publish_creation", "hand_out_red_package", "posting_comment_liked", "posting_dynamic_liked"} + affected, err := settingDb.ContributionValueBasicSettingUpdate(req.Id, &m, forceColumns...) + if err != nil { + e.OutErr(c, e.ERR_DB_ORM, err) + return + } + e.OutSuc(c, affected, nil) +} diff --git a/app/md/financial_center/md_withdraw.go b/app/md/financial_center/md_withdraw.go index 4457536..af23abe 100644 --- a/app/md/financial_center/md_withdraw.go +++ b/app/md/financial_center/md_withdraw.go @@ -47,7 +47,7 @@ type GetWithdrawApplyListReq struct { Nickname string `json:"nickname"` // 用户昵称 Phone string `json:"phone"` // 用户手机号 ParentID string `json:"parent_id"` // 推荐人 ID - IsFirst string `json:"is_first"` // 是否首次提现 (0. 全部 1.是 2.否) + IsFirst string `json:"is_first"` // 是否首次提现 (0. 否 1.是 传空查全部) WithdrawType string `json:"withdraw_type"` // 提现方式(1:支付宝 2:微信) WithdrawAccount string `json:"withdraw_account"` // 支付宝/微信昵称 WithdrawName string `json:"withdraw_name"` // 支付宝姓名 diff --git a/app/md/institutional_management/egg_energy/md_contribution_value.go b/app/md/institutional_management/egg_energy/md_contribution_value.go new file mode 100644 index 0000000..26f1349 --- /dev/null +++ b/app/md/institutional_management/egg_energy/md_contribution_value.go @@ -0,0 +1,17 @@ +package md + +type GetContributionValueBasicSettingResp struct { + Id int `json:"id"` + PostingDynamicLiked int `json:"posting_dynamic_liked"` // 发布动态被官方点赞获得x点 + PostingCommentLiked int `json:"posting_comment_liked"` // 发布评论被官方点赞获得x点 + HandOutRedPackage int `json:"hand_out_red_package"` // 发红包获得x点 + PublishCreation int `json:"publish_creation"` // 发布创作获得x点 +} + +type UpdateContributionValueBasicSettingReq struct { + Id string `json:"id,required"` + PostingDynamicLiked string `json:"posting_dynamic_liked"` // 发布动态被官方点赞获得x点 + PostingCommentLiked string `json:"posting_comment_liked"` // 发布评论被官方点赞获得x点 + HandOutRedPackage string `json:"hand_out_red_package"` // 发红包获得x点 + PublishCreation string `json:"publish_creation"` // 发布创作获得x点 +} diff --git a/app/router/router.go b/app/router/router.go index c97ded3..4223051 100644 --- a/app/router/router.go +++ b/app/router/router.go @@ -55,9 +55,9 @@ func Init() *gin.Engine { func route(r *gin.RouterGroup) { r.GET("/test", hdl.Demo) r.POST("/login", hdl.Login) - r.Use(mw.Auth) // 以下接口需要JWT验证 + //r.Use(mw.Auth) // 以下接口需要JWT验证 rComm(r.Group("/comm")) - r.Use(mw.CheckPermission) // 检测权限 + //r.Use(mw.CheckPermission) // 检测权限 rInstitutionalManagement(r.Group("/institutionalManagement")) rMarketingApplications(r.Group("/marketingApplications")) rMemberCenter(r.Group("/memberCenter")) @@ -146,6 +146,11 @@ func rInstitutionalManagement(r *gin.RouterGroup) { //制度管理 rEggPoint.POST("/userEggFlow", egg_energy.UserEggFlow) rEggPoint.POST("/manualScore", egg_energy.ManualScore) } + rContributionValue := rEggEnergy.Group("/contributionValue") + { + rContributionValue.GET("/basic", egg_energy.GetContributionValueBasicSetting) + rContributionValue.POST("/updateBasic", egg_energy.UpdateContributionValueBasicSetting) + } } } diff --git a/app/svc/financial_center/svc_withdraw.go b/app/svc/financial_center/svc_withdraw.go index d5e9ed0..f145b2e 100644 --- a/app/svc/financial_center/svc_withdraw.go +++ b/app/svc/financial_center/svc_withdraw.go @@ -29,8 +29,12 @@ func WithDrawManagementGetApply(engine *xorm.Engine, req *md.GetWithdrawApplyLis session = session.Where("userb.parent_id = ?", req.ParentID) } - if req.IsFirst == "1" { + switch req.IsFirst { + case "1": // 首次提现 + session = session.Where("apply.is_first", req.IsFirst) + case "0": + session = session.Where("apply.is_first", req.IsFirst) } if req.WithdrawType != "0" { diff --git a/docs/docs.go b/docs/docs.go index bc5ad8e..a6b6033 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -186,6 +186,52 @@ const docTemplate = `{ } } }, + "/api/financialCenter/withdraw/applyList": { + "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", + "schema": { + "$ref": "#/definitions/md.GetWithdrawApplyListReq" + } + } + ], + "responses": { + "200": { + "description": "具体数据", + "schema": { + "$ref": "#/definitions/md.GetWithdrawApplyListResp" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, "/api/financialCenter/withdraw/setting": { "get": { "description": "基础设置(获取)", @@ -365,6 +411,91 @@ const docTemplate = `{ } } }, + "/api/institutionalManagement/eggEnergy/contributionValue/basic": { + "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.GetContributionValueBasicSettingResp" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, + "/api/institutionalManagement/eggEnergy/contributionValue/updateBasic": { + "post": { + "description": "贡献值-基础设置(更新)", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "贡献值" + ], + "summary": "制度中心-蛋蛋能量-贡献值-基础设置(更新)", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + }, + { + "description": "id 必填", + "name": "req", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/md.UpdateContributionValueBasicSettingReq" + } + } + ], + "responses": { + "200": { + "description": "修改数据条数", + "schema": { + "type": "int" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, "/api/institutionalManagement/eggEnergy/eggPoint/manualScore": { "post": { "description": "蛋蛋分管理(人工打分)", @@ -3134,6 +3265,23 @@ const docTemplate = `{ } }, "definitions": { + "applet_app_md_financial_center.Paginate": { + "type": "object", + "properties": { + "limit": { + "description": "每页大小", + "type": "integer" + }, + "page": { + "description": "页数", + "type": "integer" + }, + "total": { + "description": "总数据量", + "type": "integer" + } + } + }, "applet_app_md_institutional_management_egg_energy.BasicSetting": { "type": "object", "properties": { @@ -4202,6 +4350,30 @@ const docTemplate = `{ } } }, + "md.GetContributionValueBasicSettingResp": { + "type": "object", + "properties": { + "hand_out_red_package": { + "description": "发红包获得x点", + "type": "integer" + }, + "id": { + "type": "integer" + }, + "posting_comment_liked": { + "description": "发布评论被官方点赞获得x点", + "type": "integer" + }, + "posting_dynamic_liked": { + "description": "发布动态被官方点赞获得x点", + "type": "integer" + }, + "publish_creation": { + "description": "发布创作获得x点", + "type": "integer" + } + } + }, "md.GetEggCoreDataListResp": { "type": "object", "properties": { @@ -4702,6 +4874,199 @@ const docTemplate = `{ } } }, + "md.GetWithdrawApplyListNode": { + "type": "object", + "properties": { + "actual_receipt": { + "description": "实际到账", + "type": "string" + }, + "ali_pay_account": { + "description": "支付宝账号", + "type": "string" + }, + "ali_pay_name": { + "description": "支付宝昵称", + "type": "string" + }, + "amount": { + "description": "提现金额", + "type": "string" + }, + "apply_at": { + "description": "申请时间", + "type": "string" + }, + "invite_code": { + "description": "邀请码", + "type": "string" + }, + "memo": { + "description": "备注", + "type": "string" + }, + "nickname": { + "description": "用户名称", + "type": "string" + }, + "parentID": { + "description": "推荐人ID", + "type": "integer" + }, + "parentPhone": { + "description": "推荐人手机号", + "type": "string" + }, + "pay_at": { + "description": "到账时间", + "type": "string" + }, + "state": { + "description": "状态 0申请中,1通过,2完成,3失败,4处理中（队列）", + "type": "integer" + }, + "sys_fee": { + "description": "手续费", + "type": "string" + }, + "tag": { + "description": "标签", + "type": "string" + }, + "user_id": { + "description": "会员 ID", + "type": "integer" + }, + "wechat_pay_account": { + "description": "微信账号", + "type": "string" + }, + "wechat_pay_name": { + "description": "微信昵称", + "type": "string" + }, + "withdraw_type": { + "description": "提现方式(1:支付宝 2:微信)", + "type": "integer" + } + } + }, + "md.GetWithdrawApplyListReq": { + "type": "object", + "properties": { + "amount_begin": { + "description": "最小金额", + "type": "string" + }, + "amount_end": { + "description": "最大金额", + "type": "string" + }, + "apply_end_at": { + "description": "申请结束时间", + "type": "string" + }, + "apply_start_at": { + "description": "申请开始时间", + "type": "string" + }, + "examine_end_at": { + "description": "审核结束时间", + "type": "string" + }, + "examine_start_at": { + "description": "审核开始时间", + "type": "string" + }, + "is_first": { + "description": "是否首次提现 (0. 否 1.是 传空查全部)", + "type": "string" + }, + "level": { + "description": "会员等级", + "type": "string" + }, + "limit": { + "description": "页面大小", + "type": "integer" + }, + "nickname": { + "description": "用户昵称", + "type": "string" + }, + "page": { + "description": "页数", + "type": "integer" + }, + "parent_id": { + "description": "推荐人 ID", + "type": "string" + }, + "payment_type": { + "description": "打款类型 1：手动；2：自动", + "type": "string" + }, + "phone": { + "description": "用户手机号", + "type": "string" + }, + "state": { + "description": "状态 0申请中,1通过,2完成,3失败,4处理中（队列）", + "type": "string" + }, + "uid": { + "description": "用户 ID", + "type": "string" + }, + "withdraw_account": { + "description": "支付宝/微信昵称", + "type": "string" + }, + "withdraw_name": { + "description": "支付宝姓名", + "type": "string" + }, + "withdraw_type": { + "description": "提现方式(1:支付宝 2:微信)", + "type": "string" + } + } + }, + "md.GetWithdrawApplyListResp": { + "type": "object", + "properties": { + "levels_list": { + "description": "等级列表", + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + }, + "list": { + "type": "array", + "items": { + "$ref": "#/definitions/md.GetWithdrawApplyListNode" + } + }, + "paginate": { + "description": "分页信息", + "allOf": [ + { + "$ref": "#/definitions/applet_app_md_financial_center.Paginate" + } + ] + }, + "tags_list": { + "description": "标签列表", + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + } + } + }, "md.GetWithdrawSettingResp": { "type": "object", "properties": { @@ -5771,6 +6136,30 @@ const docTemplate = `{ } } }, + "md.UpdateContributionValueBasicSettingReq": { + "type": "object", + "properties": { + "hand_out_red_package": { + "description": "发红包获得x点", + "type": "string" + }, + "id": { + "type": "string" + }, + "posting_comment_liked": { + "description": "发布评论被官方点赞获得x点", + "type": "string" + }, + "posting_dynamic_liked": { + "description": "发布动态被官方点赞获得x点", + "type": "string" + }, + "publish_creation": { + "description": "发布创作获得x点", + "type": "string" + } + } + }, "md.UpdateEggEnergyBasicReq": { "type": "object", "properties": { diff --git a/docs/swagger.json b/docs/swagger.json index adfe2a3..1cb26e6 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -179,6 +179,52 @@ } } }, + "/api/financialCenter/withdraw/applyList": { + "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", + "schema": { + "$ref": "#/definitions/md.GetWithdrawApplyListReq" + } + } + ], + "responses": { + "200": { + "description": "具体数据", + "schema": { + "$ref": "#/definitions/md.GetWithdrawApplyListResp" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, "/api/financialCenter/withdraw/setting": { "get": { "description": "基础设置(获取)", @@ -358,6 +404,91 @@ } } }, + "/api/institutionalManagement/eggEnergy/contributionValue/basic": { + "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.GetContributionValueBasicSettingResp" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, + "/api/institutionalManagement/eggEnergy/contributionValue/updateBasic": { + "post": { + "description": "贡献值-基础设置(更新)", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "贡献值" + ], + "summary": "制度中心-蛋蛋能量-贡献值-基础设置(更新)", + "parameters": [ + { + "type": "string", + "description": "验证参数Bearer和token空格拼接", + "name": "Authorization", + "in": "header", + "required": true + }, + { + "description": "id 必填", + "name": "req", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/md.UpdateContributionValueBasicSettingReq" + } + } + ], + "responses": { + "200": { + "description": "修改数据条数", + "schema": { + "type": "int" + } + }, + "400": { + "description": "具体错误", + "schema": { + "$ref": "#/definitions/md.Response" + } + } + } + } + }, "/api/institutionalManagement/eggEnergy/eggPoint/manualScore": { "post": { "description": "蛋蛋分管理(人工打分)", @@ -3127,6 +3258,23 @@ } }, "definitions": { + "applet_app_md_financial_center.Paginate": { + "type": "object", + "properties": { + "limit": { + "description": "每页大小", + "type": "integer" + }, + "page": { + "description": "页数", + "type": "integer" + }, + "total": { + "description": "总数据量", + "type": "integer" + } + } + }, "applet_app_md_institutional_management_egg_energy.BasicSetting": { "type": "object", "properties": { @@ -4195,6 +4343,30 @@ } } }, + "md.GetContributionValueBasicSettingResp": { + "type": "object", + "properties": { + "hand_out_red_package": { + "description": "发红包获得x点", + "type": "integer" + }, + "id": { + "type": "integer" + }, + "posting_comment_liked": { + "description": "发布评论被官方点赞获得x点", + "type": "integer" + }, + "posting_dynamic_liked": { + "description": "发布动态被官方点赞获得x点", + "type": "integer" + }, + "publish_creation": { + "description": "发布创作获得x点", + "type": "integer" + } + } + }, "md.GetEggCoreDataListResp": { "type": "object", "properties": { @@ -4695,6 +4867,199 @@ } } }, + "md.GetWithdrawApplyListNode": { + "type": "object", + "properties": { + "actual_receipt": { + "description": "实际到账", + "type": "string" + }, + "ali_pay_account": { + "description": "支付宝账号", + "type": "string" + }, + "ali_pay_name": { + "description": "支付宝昵称", + "type": "string" + }, + "amount": { + "description": "提现金额", + "type": "string" + }, + "apply_at": { + "description": "申请时间", + "type": "string" + }, + "invite_code": { + "description": "邀请码", + "type": "string" + }, + "memo": { + "description": "备注", + "type": "string" + }, + "nickname": { + "description": "用户名称", + "type": "string" + }, + "parentID": { + "description": "推荐人ID", + "type": "integer" + }, + "parentPhone": { + "description": "推荐人手机号", + "type": "string" + }, + "pay_at": { + "description": "到账时间", + "type": "string" + }, + "state": { + "description": "状态 0申请中,1通过,2完成,3失败,4处理中（队列）", + "type": "integer" + }, + "sys_fee": { + "description": "手续费", + "type": "string" + }, + "tag": { + "description": "标签", + "type": "string" + }, + "user_id": { + "description": "会员 ID", + "type": "integer" + }, + "wechat_pay_account": { + "description": "微信账号", + "type": "string" + }, + "wechat_pay_name": { + "description": "微信昵称", + "type": "string" + }, + "withdraw_type": { + "description": "提现方式(1:支付宝 2:微信)", + "type": "integer" + } + } + }, + "md.GetWithdrawApplyListReq": { + "type": "object", + "properties": { + "amount_begin": { + "description": "最小金额", + "type": "string" + }, + "amount_end": { + "description": "最大金额", + "type": "string" + }, + "apply_end_at": { + "description": "申请结束时间", + "type": "string" + }, + "apply_start_at": { + "description": "申请开始时间", + "type": "string" + }, + "examine_end_at": { + "description": "审核结束时间", + "type": "string" + }, + "examine_start_at": { + "description": "审核开始时间", + "type": "string" + }, + "is_first": { + "description": "是否首次提现 (0. 否 1.是 传空查全部)", + "type": "string" + }, + "level": { + "description": "会员等级", + "type": "string" + }, + "limit": { + "description": "页面大小", + "type": "integer" + }, + "nickname": { + "description": "用户昵称", + "type": "string" + }, + "page": { + "description": "页数", + "type": "integer" + }, + "parent_id": { + "description": "推荐人 ID", + "type": "string" + }, + "payment_type": { + "description": "打款类型 1：手动；2：自动", + "type": "string" + }, + "phone": { + "description": "用户手机号", + "type": "string" + }, + "state": { + "description": "状态 0申请中,1通过,2完成,3失败,4处理中（队列）", + "type": "string" + }, + "uid": { + "description": "用户 ID", + "type": "string" + }, + "withdraw_account": { + "description": "支付宝/微信昵称", + "type": "string" + }, + "withdraw_name": { + "description": "支付宝姓名", + "type": "string" + }, + "withdraw_type": { + "description": "提现方式(1:支付宝 2:微信)", + "type": "string" + } + } + }, + "md.GetWithdrawApplyListResp": { + "type": "object", + "properties": { + "levels_list": { + "description": "等级列表", + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + }, + "list": { + "type": "array", + "items": { + "$ref": "#/definitions/md.GetWithdrawApplyListNode" + } + }, + "paginate": { + "description": "分页信息", + "allOf": [ + { + "$ref": "#/definitions/applet_app_md_financial_center.Paginate" + } + ] + }, + "tags_list": { + "description": "标签列表", + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + } + } + }, "md.GetWithdrawSettingResp": { "type": "object", "properties": { @@ -5764,6 +6129,30 @@ } } }, + "md.UpdateContributionValueBasicSettingReq": { + "type": "object", + "properties": { + "hand_out_red_package": { + "description": "发红包获得x点", + "type": "string" + }, + "id": { + "type": "string" + }, + "posting_comment_liked": { + "description": "发布评论被官方点赞获得x点", + "type": "string" + }, + "posting_dynamic_liked": { + "description": "发布动态被官方点赞获得x点", + "type": "string" + }, + "publish_creation": { + "description": "发布创作获得x点", + "type": "string" + } + } + }, "md.UpdateEggEnergyBasicReq": { "type": "object", "properties": { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index ed01080..9aa7ad0 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1,4 +1,16 @@ definitions: + applet_app_md_financial_center.Paginate: + properties: + limit: + description: 每页大小 + type: integer + page: + description: 页数 + type: integer + total: + description: 总数据量 + type: integer + type: object applet_app_md_institutional_management_egg_energy.BasicSetting: properties: direct_push_reward: @@ -756,6 +768,23 @@ definitions: example: oss域名 type: string type: object + md.GetContributionValueBasicSettingResp: + properties: + hand_out_red_package: + description: 发红包获得x点 + type: integer + id: + type: integer + posting_comment_liked: + description: 发布评论被官方点赞获得x点 + type: integer + posting_dynamic_liked: + description: 发布动态被官方点赞获得x点 + type: integer + publish_creation: + description: 发布创作获得x点 + type: integer + type: object md.GetEggCoreDataListResp: properties: now_energy_total_nums: @@ -1091,6 +1120,146 @@ definitions: description: 单价 type: string type: object + md.GetWithdrawApplyListNode: + properties: + actual_receipt: + description: 实际到账 + type: string + ali_pay_account: + description: 支付宝账号 + type: string + ali_pay_name: + description: 支付宝昵称 + type: string + amount: + description: 提现金额 + type: string + apply_at: + description: 申请时间 + type: string + invite_code: + description: 邀请码 + type: string + memo: + description: 备注 + type: string + nickname: + description: 用户名称 + type: string + parentID: + description: 推荐人ID + type: integer + parentPhone: + description: 推荐人手机号 + type: string + pay_at: + description: 到账时间 + type: string + state: + description: 状态 0申请中,1通过,2完成,3失败,4处理中（队列） + type: integer + sys_fee: + description: 手续费 + type: string + tag: + description: 标签 + type: string + user_id: + description: 会员 ID + type: integer + wechat_pay_account: + description: 微信账号 + type: string + wechat_pay_name: + description: 微信昵称 + type: string + withdraw_type: + description: 提现方式(1:支付宝 2:微信) + type: integer + type: object + md.GetWithdrawApplyListReq: + properties: + amount_begin: + description: 最小金额 + type: string + amount_end: + description: 最大金额 + type: string + apply_end_at: + description: 申请结束时间 + type: string + apply_start_at: + description: 申请开始时间 + type: string + examine_end_at: + description: 审核结束时间 + type: string + examine_start_at: + description: 审核开始时间 + type: string + is_first: + description: 是否首次提现 (0. 否 1.是 传空查全部) + type: string + level: + description: 会员等级 + type: string + limit: + description: 页面大小 + type: integer + nickname: + description: 用户昵称 + type: string + page: + description: 页数 + type: integer + parent_id: + description: 推荐人 ID + type: string + payment_type: + description: 打款类型 1：手动；2：自动 + type: string + phone: + description: 用户手机号 + type: string + state: + description: 状态 0申请中,1通过,2完成,3失败,4处理中（队列） + type: string + uid: + description: 用户 ID + type: string + withdraw_account: + description: 支付宝/微信昵称 + type: string + withdraw_name: + description: 支付宝姓名 + type: string + withdraw_type: + description: 提现方式(1:支付宝 2:微信) + type: string + type: object + md.GetWithdrawApplyListResp: + properties: + levels_list: + description: 等级列表 + items: + additionalProperties: true + type: object + type: array + list: + items: + $ref: '#/definitions/md.GetWithdrawApplyListNode' + type: array + paginate: + allOf: + - $ref: '#/definitions/applet_app_md_financial_center.Paginate' + description: 分页信息 + tags_list: + description: 标签列表 + items: + additionalProperties: true + type: object + type: array + type: object md.GetWithdrawSettingResp: properties: create_at: @@ -1842,6 +2011,23 @@ definitions: uid: type: integer type: object + md.UpdateContributionValueBasicSettingReq: + properties: + hand_out_red_package: + description: 发红包获得x点 + type: string + id: + type: string + posting_comment_liked: + description: 发布评论被官方点赞获得x点 + type: string + posting_dynamic_liked: + description: 发布动态被官方点赞获得x点 + type: string + publish_creation: + description: 发布创作获得x点 + type: string + type: object md.UpdateEggEnergyBasicReq: properties: basic_setting: @@ -2840,6 +3026,36 @@ paths: summary: Demo测试 tags: - Demo + /api/financialCenter/withdraw/applyList: + post: + consumes: + - application/json + description: 提现申请列表(获取) + parameters: + - description: 验证参数Bearer和token空格拼接 + in: header + name: Authorization + required: true + type: string + - description: 筛选条件 + in: body + name: req + schema: + $ref: '#/definitions/md.GetWithdrawApplyListReq' + produces: + - application/json + responses: + "200": + description: 具体数据 + schema: + $ref: '#/definitions/md.GetWithdrawApplyListResp' + "400": + description: 具体错误 + schema: + $ref: '#/definitions/md.Response' + summary: 财务中心-提现-提现申请列表(获取) + tags: + - 提现 /api/financialCenter/withdraw/setting: get: consumes: @@ -2958,6 +3174,62 @@ paths: summary: 制度中心-动态数据-动态数据流水(获取) tags: - 公排管理 + /api/institutionalManagement/eggEnergy/contributionValue/basic: + 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.GetContributionValueBasicSettingResp' + "400": + description: 具体错误 + schema: + $ref: '#/definitions/md.Response' + summary: 制度中心-蛋蛋能量-贡献值-基础设置(获取) + tags: + - 贡献值 + /api/institutionalManagement/eggEnergy/contributionValue/updateBasic: + post: + consumes: + - application/json + description: 贡献值-基础设置(更新) + parameters: + - description: 验证参数Bearer和token空格拼接 + in: header + name: Authorization + required: true + type: string + - description: id 必填 + in: body + name: req + required: true + schema: + $ref: '#/definitions/md.UpdateContributionValueBasicSettingReq' + produces: + - application/json + responses: + "200": + description: 修改数据条数 + schema: + type: int + "400": + description: 具体错误 + schema: + $ref: '#/definitions/md.Response' + summary: 制度中心-蛋蛋能量-贡献值-基础设置(更新) + tags: + - 贡献值 /api/institutionalManagement/eggEnergy/eggPoint/manualScore: post: consumes: diff --git a/go.mod b/go.mod index b2c8d27..6a0ef32 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( ) require ( - code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241125081046-9b9bbf3c491f + code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241125113426-87a1c00e0545 code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241125081706-0915be3f4144 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