diff --git a/app/hdl/financial_center/hdl_withdraw.go b/app/hdl/financial_center/hdl_withdraw.go index 079652c..48505bf 100644 --- a/app/hdl/financial_center/hdl_withdraw.go +++ b/app/hdl/financial_center/hdl_withdraw.go @@ -54,11 +54,11 @@ func GetWithdrawSetting(c *gin.Context) { if setting == nil { now := time.Now() frequency := md2.WithdrawFrequencySettingStruct{ - Duration: 0, + Duration: 1, Num: emptyNum, } withdrawFeeSet := md2.WithdrawFeeSetStruct{ - Kind: 0, + Kind: 1, Value: 0, } firstWithdrawSet := md2.FirstWithdrawSet{ @@ -69,21 +69,21 @@ func GetWithdrawSetting(c *gin.Context) { withdrawFeeSetStr := utils.SerializeStr(withdrawFeeSet) firstWithdrawSetStr := utils.SerializeStr(firstWithdrawSet) m := model.FinWithdrawSetting{ - FrequencySet: frequencyStr, - WithdrawType: 0, - VipLevelLimit: 0, - IsRealName: 0, - WithdrawNumsLimit: 0, - WithdrawAmountLimit: "", - WithdrawMultipleLimit: "", - IsSupportDecimalPoint: 0, - IsAuto: 0, - IsAutoAmountLimit: "", - WithdrawTimeInterval: "00:00-00:00", - WithdrawFeeSet: withdrawFeeSetStr, - FirstWithdrawSet: firstWithdrawSetStr, - CreateAt: now.Format("2006-01-02 15:04:05"), - UpdateAt: "", + FrequencySet: frequencyStr, + WithdrawType: 1, + VipLevelLimit: 0, + IsRealName: 0, + WithdrawNumsLimit: 0, + WithdrawAmountLimit: "", + WithdrawMultipleLimit: "", + IsSupportDecimalPoint: 0, + IsAuto: 0, + WithdrawTimeInterval: "00:00-00:00", + WithdrawFeeSet: withdrawFeeSetStr, + PendingOrdersIsCanApply: 0, + ConditionIsOpen: 0, + FirstWithdrawSet: firstWithdrawSetStr, + CreateAt: now.Format("2006-01-02 15:04:05"), } _, err2 := settingDb.FinWithdrawSettingInsert(&m) if err2 != nil { @@ -109,23 +109,23 @@ func GetWithdrawSetting(c *gin.Context) { EndAt: withdrawTimeIntervals[1], } resp := md.GetWithdrawSettingResp{ - Id: setting.Id, - FrequencySet: frequency, - WithdrawType: setting.WithdrawType, - VipLevelLimit: setting.VipLevelLimit, - IsRealName: setting.IsRealName, - WithdrawNumsLimit: setting.WithdrawNumsLimit, - WithdrawAmountLimit: setting.WithdrawAmountLimit, - WithdrawMultipleLimit: setting.WithdrawMultipleLimit, - IsSupportDecimalPoint: setting.IsSupportDecimalPoint, - IsAuto: setting.IsAuto, - IsAutoAmountLimit: setting.IsAutoAmountLimit, - WithdrawTimeInterval: withdrawTimeInterval, - WithdrawFeeSet: withdrawFeeSet, - FirstWithdrawSet: firstWithdrawSet, - CreateAt: setting.CreateAt, - UpdateAt: setting.UpdateAt, - LevelList: levelsList, + Id: setting.Id, + FrequencySet: frequency, + WithdrawType: setting.WithdrawType, + VipLevelLimit: setting.VipLevelLimit, + IsRealName: setting.IsRealName, + WithdrawNumsLimit: setting.WithdrawNumsLimit, + WithdrawAmountLimit: setting.WithdrawAmountLimit, + WithdrawMultipleLimit: setting.WithdrawMultipleLimit, + IsSupportDecimalPoint: setting.IsSupportDecimalPoint, + IsAuto: setting.IsAuto, + IsAutoAmountLimit: setting.IsAutoAmountLimit, + WithdrawTimeInterval: withdrawTimeInterval, + WithdrawFeeSet: withdrawFeeSet, + FirstWithdrawSet: firstWithdrawSet, + PendingOrdersIsCanApply: setting.PendingOrdersIsCanApply, + ConditionIsOpen: setting.ConditionIsOpen, + LevelList: levelsList, } e.OutSuc(c, resp, nil) @@ -156,23 +156,29 @@ func UpdateWithdrawSetting(c *gin.Context) { withdrawTimeInterval = append(withdrawTimeInterval, req.WithdrawTimeInterval.EndAt) withdrawTimeIntervalStr := strings.Join(withdrawTimeInterval, "-") m := model.FinWithdrawSetting{ - Id: req.Id, - FrequencySet: frequencyStr, - WithdrawType: req.WithdrawType, - VipLevelLimit: req.VipLevelLimit, - IsRealName: req.IsRealName, - WithdrawNumsLimit: req.WithdrawNumsLimit, - WithdrawAmountLimit: req.WithdrawAmountLimit, - WithdrawMultipleLimit: req.WithdrawMultipleLimit, - IsSupportDecimalPoint: req.IsSupportDecimalPoint, - IsAuto: req.IsAuto, - IsAutoAmountLimit: req.IsAutoAmountLimit, - WithdrawTimeInterval: withdrawTimeIntervalStr, - WithdrawFeeSet: withdrawFeeSetStr, - FirstWithdrawSet: firstWithdrawSetStr, + Id: req.Id, + FrequencySet: frequencyStr, + WithdrawType: req.WithdrawType, + VipLevelLimit: req.VipLevelLimit, + IsRealName: req.IsRealName, + WithdrawNumsLimit: req.WithdrawNumsLimit, + WithdrawAmountLimit: req.WithdrawAmountLimit, + WithdrawMultipleLimit: req.WithdrawMultipleLimit, + IsSupportDecimalPoint: req.IsSupportDecimalPoint, + IsAuto: req.IsAuto, + IsAutoAmountLimit: req.IsAutoAmountLimit, + WithdrawTimeInterval: withdrawTimeIntervalStr, + WithdrawFeeSet: withdrawFeeSetStr, + PendingOrdersIsCanApply: req.PendingOrdersIsCanApply, + ConditionIsOpen: req.ConditionIsOpen, + FirstWithdrawSet: firstWithdrawSetStr, } - forceColumns := []string{"withdraw_type", "is_real_name", "withdraw_nums_limit", "withdraw_amount_limit", "withdraw_multiple_limit", "is_support_decimal_point", "is_auto", "first_withdraw_set", "is_auto_amount_limit"} + forceColumns := []string{"withdraw_type", "is_real_name", "withdraw_nums_limit", + "withdraw_amount_limit", "withdraw_multiple_limit", "is_support_decimal_point", + "is_auto", "first_withdraw_set", "is_auto_amount_limit", "pending_orders_is_can_apply", + "condition_is_open", + } settingDb := implement.NewFinWithdrawSettingDb(db.Db) affected, err := settingDb.FinWithdrawSettingUpdate(req.Id, &m, forceColumns...) if err != nil { @@ -321,11 +327,48 @@ func GetWithdrawApplyList(c *gin.Context) { list[i].Tag = tagList } } + applyDb := implement.NewFinWithdrawApplyDb(db.Db) + underReviewAmount, err := applyDb.FinWithdrawApplyAmountGetByParams(map[string]interface{}{ + "key": "state", + "value": 0, + }) + if err != nil { + e.OutErr(c, e.ERR_DB_ORM, err.Error()) + return + } + pendingAmount, err := applyDb.FinWithdrawApplyAmountGetByParams(map[string]interface{}{ + "key": "state", + "value": 4, + }) + if err != nil { + e.OutErr(c, e.ERR_DB_ORM, err.Error()) + return + } + paySucceedAmount, err := applyDb.FinWithdrawApplyAmountGetByParams(map[string]interface{}{ + "key": "state", + "value": 2, + }) + if err != nil { + e.OutErr(c, e.ERR_DB_ORM, err.Error()) + return + } + payFailedAmount, err := applyDb.FinWithdrawApplyAmountGetByParams(map[string]interface{}{ + "key": "state", + "value": 3, + }) + if err != nil { + e.OutErr(c, e.ERR_DB_ORM, err.Error()) + return + } resp := md.GetWithdrawApplyListResp{ - LevelsList: levelsList, - TagsList: tagsList, - List: list, + LevelsList: levelsList, + TagsList: tagsList, + PendingAmount: utils.Float64ToStr(pendingAmount), + PaySucceedAmount: utils.Float64ToStr(paySucceedAmount), + PayFailedAmount: utils.Float64ToStr(payFailedAmount), + UnderReviewAmount: utils.Float64ToStr(underReviewAmount), + List: list, Paginate: md.Paginate{ Limit: req.Limit, Page: req.Page, diff --git a/app/md/financial_center/md_withdraw.go b/app/md/financial_center/md_withdraw.go index 46efe6f..3d84dc0 100644 --- a/app/md/financial_center/md_withdraw.go +++ b/app/md/financial_center/md_withdraw.go @@ -11,40 +11,42 @@ type Paginate struct { } type GetWithdrawSettingResp struct { - Id int64 `json:"id"` - FrequencySet md.WithdrawFrequencySettingStruct `json:"frequency_set"` // 频率设置(0:日 1:周 2:月 3:年) - WithdrawType int `json:"withdraw_type"` // 提现方式(1:支付宝 2:微信) - VipLevelLimit int `json:"vip_level_limit"` // 提现等级限制 - IsRealName int `json:"is_real_name"` // 是否实名(0:否 1:是) - WithdrawNumsLimit int `json:"withdraw_nums_limit"` // 提现次数限制(对应上方设置周期，0为不限制，失败、驳回不计数 ) - WithdrawAmountLimit string `json:"withdraw_amount_limit"` // 提现金额限制(0为不限制，大于等于该金额才可以申请提现 ) - WithdrawMultipleLimit string `json:"withdraw_multiple_limit"` // 提现倍数限制（0为不限制，金额限制倍数才可以申请提现 ) - IsSupportDecimalPoint int `json:"is_support_decimal_point"` // 是否支持小数点(0:否 1:是) - IsAuto int `json:"is_auto"` // 是否开启自动提现(0:否 1:是) - IsAutoAmountLimit string `json:"is_auto_amount_limit"` // 自动提现金额限制 - WithdrawTimeInterval md.WithdrawTimeIntervalStruct `json:"withdraw_time_interval"` // 提现时段 - WithdrawFeeSet md.WithdrawFeeSetStruct `json:"withdraw_fee_set"` // 提现手续费设置 - FirstWithdrawSet md.FirstWithdrawSet `json:"first_withdraw_set"` // 首次提现设置 - CreateAt string `json:"create_at"` // 申请时间 - UpdateAt string `json:"update_at"` // 处理时间 - LevelList []map[string]interface{} `json:"level_list"` // 会员等级列表 + Id int64 `json:"id"` + FrequencySet md.WithdrawFrequencySettingStruct `json:"frequency_set"` // 频率设置(0:日 1:周 2:月 3:年) + WithdrawType int `json:"withdraw_type"` // 提现方式(1:支付宝 2:微信) + VipLevelLimit int `json:"vip_level_limit"` // 提现等级限制 + IsRealName int `json:"is_real_name"` // 是否实名(0:否 1:是) + WithdrawNumsLimit int `json:"withdraw_nums_limit"` // 提现次数限制(对应上方设置周期，0为不限制，失败、驳回不计数 ) + WithdrawAmountLimit string `json:"withdraw_amount_limit"` // 提现金额限制(0为不限制，大于等于该金额才可以申请提现 ) + WithdrawMultipleLimit string `json:"withdraw_multiple_limit"` // 提现倍数限制（0为不限制，金额限制倍数才可以申请提现 ) + IsSupportDecimalPoint int `json:"is_support_decimal_point"` // 是否支持小数点(0:否 1:是) + IsAuto int `json:"is_auto"` // 是否开启自动提现(0:否 1:是) + IsAutoAmountLimit string `json:"is_auto_amount_limit"` // 自动提现金额限制 + WithdrawTimeInterval md.WithdrawTimeIntervalStruct `json:"withdraw_time_interval"` // 提现时段 + WithdrawFeeSet md.WithdrawFeeSetStruct `json:"withdraw_fee_set"` // 提现手续费设置 + FirstWithdrawSet md.FirstWithdrawSet `json:"first_withdraw_set"` // 首次提现设置 + PendingOrdersIsCanApply int `json:"pending_orders_is_can_apply"` // 存在待处理记录是否允许再次申请提现(0:禁止,1:允许) + ConditionIsOpen int `json:"condition_is_open"` // 提现条件是否开启(0:关闭, 1:开启) + LevelList []map[string]interface{} `json:"level_list"` // 会员等级列表 } type UpdateWithdrawSettingReq struct { - Id int64 `json:"id,required"` - FrequencySet md.WithdrawFrequencySettingStruct `json:"frequency_set"` // 频率设置(num 个 duration) (duration (0.天 1.小时 2.周 3.月 4.年)) - WithdrawType int `json:"withdraw_type"` // 提现方式(1:支付宝 2:微信) - VipLevelLimit int `json:"vip_level_limit"` // 提现等级限制 - IsRealName int `json:"is_real_name"` // 是否实名(0:否 1:是) - WithdrawNumsLimit int `json:"withdraw_nums_limit"` // 提现次数限制(对应上方设置周期，0为不限制，失败、驳回不计数 ) - WithdrawAmountLimit string `json:"withdraw_amount_limit"` // 提现金额限制(0为不限制，大于等于该金额才可以申请提现 ) - WithdrawMultipleLimit string `json:"withdraw_multiple_limit"` // 提现倍数限制（0为不限制，金额限制倍数才可以申请提现 ) - IsSupportDecimalPoint int `json:"is_support_decimal_point"` // 是否支持小数点(0:否 1:是) - IsAuto int `json:"is_auto"` // 是否开启自动提现(0:否 1:是) - IsAutoAmountLimit string `json:"is_auto_amount_limit"` // 自动提现金额限制 - WithdrawTimeInterval md.WithdrawTimeIntervalStruct `json:"withdraw_time_interval"` // 提现时段(startAt xx:xx endAt xx:xx) - WithdrawFeeSet md.WithdrawFeeSetStruct `json:"withdraw_fee_set"` // 提现手续费设置 - FirstWithdrawSet md.FirstWithdrawSet `json:"first_withdraw_set"` // 首次提现设置 + Id int64 `json:"id,required"` + FrequencySet md.WithdrawFrequencySettingStruct `json:"frequency_set"` // 频率设置(num 个 duration) (duration (0.天 1.小时 2.周 3.月 4.年)) + WithdrawType int `json:"withdraw_type"` // 提现方式(1:支付宝 2:微信) + VipLevelLimit int `json:"vip_level_limit"` // 提现等级限制 + IsRealName int `json:"is_real_name"` // 是否实名(0:否 1:是) + WithdrawNumsLimit int `json:"withdraw_nums_limit"` // 提现次数限制(对应上方设置周期，0为不限制，失败、驳回不计数 ) + WithdrawAmountLimit string `json:"withdraw_amount_limit"` // 提现金额限制(0为不限制，大于等于该金额才可以申请提现 ) + WithdrawMultipleLimit string `json:"withdraw_multiple_limit"` // 提现倍数限制（0为不限制，金额限制倍数才可以申请提现 ) + IsSupportDecimalPoint int `json:"is_support_decimal_point"` // 是否支持小数点(0:否 1:是) + IsAuto int `json:"is_auto"` // 是否开启自动提现(0:否 1:是) + IsAutoAmountLimit string `json:"is_auto_amount_limit"` // 自动提现金额限制 + WithdrawTimeInterval md.WithdrawTimeIntervalStruct `json:"withdraw_time_interval"` // 提现时段(startAt xx:xx endAt xx:xx) + WithdrawFeeSet md.WithdrawFeeSetStruct `json:"withdraw_fee_set"` // 提现手续费设置 + FirstWithdrawSet md.FirstWithdrawSet `json:"first_withdraw_set"` // 首次提现设置 + PendingOrdersIsCanApply int `json:"pending_orders_is_can_apply"` // 存在待处理记录是否允许再次申请提现(0:禁止,1:允许) + ConditionIsOpen int `json:"condition_is_open"` // 提现条件是否开启(0:关闭, 1:开启) } type GetWithdrawApplyListReq struct { Uid string `json:"uid"` // 用户 ID @@ -88,10 +90,14 @@ type WithdrawApplyInfo struct { } type GetWithdrawApplyListResp struct { - LevelsList []map[string]interface{} `json:"levels_list"` // 等级列表 - TagsList []map[string]interface{} `json:"tags_list"` // 标签列表 - List []GetWithdrawApplyListNode `json:"list"` - Paginate Paginate `json:"paginate"` // 分页信息 + LevelsList []map[string]interface{} `json:"levels_list"` // 等级列表 + TagsList []map[string]interface{} `json:"tags_list"` // 标签列表 + PendingAmount string `json:"pending_amount"` // 处理中金额 + PaySucceedAmount string `json:"pay_succeed_amount"` // 打款成功金额 + PayFailedAmount string `json:"pay_failed_amount"` // 打款失败金额 + UnderReviewAmount string `json:"under_review"` // 审核中金额 + List []GetWithdrawApplyListNode `json:"list"` + Paginate Paginate `json:"paginate"` // 分页信息 } type GetWithdrawApplyListNode struct { diff --git a/docs/docs.go b/docs/docs.go index dec688c..87dfbcd 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -6534,6 +6534,17 @@ const docTemplate = `{ } } }, + "applet_app_md_financial_center.TagNode": { + "type": "object", + "properties": { + "tag_id": { + "type": "integer" + }, + "tag_name": { + "type": "string" + } + } + }, "applet_app_md_im.GetBasicResp": { "type": "object", "properties": { @@ -6726,6 +6737,19 @@ const docTemplate = `{ } } }, + "applet_app_md_member_center.TagNode": { + "type": "object", + "properties": { + "tag_id": { + "description": "标签 ID", + "type": "integer" + }, + "tag_name": { + "description": "标签 名称", + "type": "string" + } + } + }, "applet_app_md_setCenter_oss_aliyun.GetBasicResp": { "type": "object", "properties": { @@ -7638,7 +7662,7 @@ const docTemplate = `{ "description": "标签名称", "type": "array", "items": { - "$ref": "#/definitions/md.TagNode" + "$ref": "#/definitions/applet_app_md_member_center.TagNode" } }, "union_id": { @@ -9240,7 +9264,10 @@ const docTemplate = `{ }, "tag": { "description": "标签", - "type": "string" + "type": "array", + "items": { + "$ref": "#/definitions/applet_app_md_financial_center.TagNode" + } }, "user_id": { "description": "会员 ID", @@ -9255,7 +9282,7 @@ const docTemplate = `{ "type": "string" }, "withdraw_type": { - "description": "提现方式(1:支付宝 2:微信)", + "description": "转账平台(1:支付宝 2:微信)", "type": "integer" } } @@ -9366,6 +9393,18 @@ const docTemplate = `{ } ] }, + "pay_failed_amount": { + "description": "打款失败金额", + "type": "string" + }, + "pay_succeed_amount": { + "description": "打款成功金额", + "type": "string" + }, + "pending_amount": { + "description": "处理中金额", + "type": "string" + }, "tags_list": { "description": "标签列表", "type": "array", @@ -9373,15 +9412,19 @@ const docTemplate = `{ "type": "object", "additionalProperties": true } + }, + "under_review": { + "description": "审核中金额", + "type": "string" } } }, "md.GetWithdrawSettingResp": { "type": "object", "properties": { - "create_at": { - "description": "申请时间", - "type": "string" + "condition_is_open": { + "description": "提现条件是否开启(0:关闭, 1:开启)", + "type": "integer" }, "first_withdraw_set": { "description": "首次提现设置", @@ -9418,9 +9461,17 @@ const docTemplate = `{ "description": "是否支持小数点(0:否 1:是)", "type": "integer" }, - "update_at": { - "description": "处理时间", - "type": "string" + "level_list": { + "description": "会员等级列表", + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + }, + "pending_orders_is_can_apply": { + "description": "存在待处理记录是否允许再次申请提现(0:禁止,1:允许)", + "type": "integer" }, "vip_level_limit": { "description": "提现等级限制", @@ -10967,19 +11018,6 @@ const docTemplate = `{ } } }, - "md.TagNode": { - "type": "object", - "properties": { - "tag_id": { - "description": "标签 ID", - "type": "integer" - }, - "tag_name": { - "description": "标签 名称", - "type": "string" - } - } - }, "md.TreeNode": { "type": "object", "properties": { @@ -11298,6 +11336,10 @@ const docTemplate = `{ "md.UpdateWithdrawSettingReq": { "type": "object", "properties": { + "condition_is_open": { + "description": "提现条件是否开启(0:关闭, 1:开启)", + "type": "integer" + }, "first_withdraw_set": { "description": "首次提现设置", "allOf": [ @@ -11333,6 +11375,10 @@ const docTemplate = `{ "description": "是否支持小数点(0:否 1:是)", "type": "integer" }, + "pending_orders_is_can_apply": { + "description": "存在待处理记录是否允许再次申请提现(0:禁止,1:允许)", + "type": "integer" + }, "vip_level_limit": { "description": "提现等级限制", "type": "integer" @@ -12083,7 +12129,7 @@ const docTemplate = `{ "description": "会员标签", "type": "array", "items": { - "$ref": "#/definitions/md.TagNode" + "$ref": "#/definitions/applet_app_md_member_center.TagNode" } }, "wechat": { diff --git a/docs/swagger.json b/docs/swagger.json index 96e2d19..80c560a 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -6527,6 +6527,17 @@ } } }, + "applet_app_md_financial_center.TagNode": { + "type": "object", + "properties": { + "tag_id": { + "type": "integer" + }, + "tag_name": { + "type": "string" + } + } + }, "applet_app_md_im.GetBasicResp": { "type": "object", "properties": { @@ -6719,6 +6730,19 @@ } } }, + "applet_app_md_member_center.TagNode": { + "type": "object", + "properties": { + "tag_id": { + "description": "标签 ID", + "type": "integer" + }, + "tag_name": { + "description": "标签 名称", + "type": "string" + } + } + }, "applet_app_md_setCenter_oss_aliyun.GetBasicResp": { "type": "object", "properties": { @@ -7631,7 +7655,7 @@ "description": "标签名称", "type": "array", "items": { - "$ref": "#/definitions/md.TagNode" + "$ref": "#/definitions/applet_app_md_member_center.TagNode" } }, "union_id": { @@ -9233,7 +9257,10 @@ }, "tag": { "description": "标签", - "type": "string" + "type": "array", + "items": { + "$ref": "#/definitions/applet_app_md_financial_center.TagNode" + } }, "user_id": { "description": "会员 ID", @@ -9248,7 +9275,7 @@ "type": "string" }, "withdraw_type": { - "description": "提现方式(1:支付宝 2:微信)", + "description": "转账平台(1:支付宝 2:微信)", "type": "integer" } } @@ -9359,6 +9386,18 @@ } ] }, + "pay_failed_amount": { + "description": "打款失败金额", + "type": "string" + }, + "pay_succeed_amount": { + "description": "打款成功金额", + "type": "string" + }, + "pending_amount": { + "description": "处理中金额", + "type": "string" + }, "tags_list": { "description": "标签列表", "type": "array", @@ -9366,15 +9405,19 @@ "type": "object", "additionalProperties": true } + }, + "under_review": { + "description": "审核中金额", + "type": "string" } } }, "md.GetWithdrawSettingResp": { "type": "object", "properties": { - "create_at": { - "description": "申请时间", - "type": "string" + "condition_is_open": { + "description": "提现条件是否开启(0:关闭, 1:开启)", + "type": "integer" }, "first_withdraw_set": { "description": "首次提现设置", @@ -9411,9 +9454,17 @@ "description": "是否支持小数点(0:否 1:是)", "type": "integer" }, - "update_at": { - "description": "处理时间", - "type": "string" + "level_list": { + "description": "会员等级列表", + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + }, + "pending_orders_is_can_apply": { + "description": "存在待处理记录是否允许再次申请提现(0:禁止,1:允许)", + "type": "integer" }, "vip_level_limit": { "description": "提现等级限制", @@ -10960,19 +11011,6 @@ } } }, - "md.TagNode": { - "type": "object", - "properties": { - "tag_id": { - "description": "标签 ID", - "type": "integer" - }, - "tag_name": { - "description": "标签 名称", - "type": "string" - } - } - }, "md.TreeNode": { "type": "object", "properties": { @@ -11291,6 +11329,10 @@ "md.UpdateWithdrawSettingReq": { "type": "object", "properties": { + "condition_is_open": { + "description": "提现条件是否开启(0:关闭, 1:开启)", + "type": "integer" + }, "first_withdraw_set": { "description": "首次提现设置", "allOf": [ @@ -11326,6 +11368,10 @@ "description": "是否支持小数点(0:否 1:是)", "type": "integer" }, + "pending_orders_is_can_apply": { + "description": "存在待处理记录是否允许再次申请提现(0:禁止,1:允许)", + "type": "integer" + }, "vip_level_limit": { "description": "提现等级限制", "type": "integer" @@ -12076,7 +12122,7 @@ "description": "会员标签", "type": "array", "items": { - "$ref": "#/definitions/md.TagNode" + "$ref": "#/definitions/applet_app_md_member_center.TagNode" } }, "wechat": { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 5a00b36..7295c8b 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -11,6 +11,13 @@ definitions: description: 总数据量 type: integer type: object + applet_app_md_financial_center.TagNode: + properties: + tag_id: + type: integer + tag_name: + type: string + type: object applet_app_md_im.GetBasicResp: properties: chat_sensitive_words: @@ -146,6 +153,15 @@ definitions: description: 总数据量 type: integer type: object + applet_app_md_member_center.TagNode: + properties: + tag_id: + description: 标签 ID + type: integer + tag_name: + description: 标签 名称 + type: string + type: object applet_app_md_setCenter_oss_aliyun.GetBasicResp: properties: oss_access_key_id: @@ -779,7 +795,7 @@ definitions: tag: description: 标签名称 items: - $ref: '#/definitions/md.TagNode' + $ref: '#/definitions/applet_app_md_member_center.TagNode' type: array union_id: description: 微信号 @@ -1881,7 +1897,9 @@ definitions: type: string tag: description: 标签 - type: string + items: + $ref: '#/definitions/applet_app_md_financial_center.TagNode' + type: array user_id: description: 会员 ID type: integer @@ -1892,7 +1910,7 @@ definitions: description: 微信昵称 type: string withdraw_type: - description: 提现方式(1:支付宝 2:微信) + description: 转账平台(1:支付宝 2:微信) type: integer type: object md.GetWithdrawApplyListReq: @@ -1971,18 +1989,30 @@ definitions: allOf: - $ref: '#/definitions/applet_app_md_financial_center.Paginate' description: 分页信息 + pay_failed_amount: + description: 打款失败金额 + type: string + pay_succeed_amount: + description: 打款成功金额 + type: string + pending_amount: + description: 处理中金额 + type: string tags_list: description: 标签列表 items: additionalProperties: true type: object type: array + under_review: + description: 审核中金额 + type: string type: object md.GetWithdrawSettingResp: properties: - create_at: - description: 申请时间 - type: string + condition_is_open: + description: 提现条件是否开启(0:关闭, 1:开启) + type: integer first_withdraw_set: allOf: - $ref: '#/definitions/md.FirstWithdrawSet' @@ -2005,9 +2035,15 @@ definitions: is_support_decimal_point: description: 是否支持小数点(0:否 1:是) type: integer - update_at: - description: 处理时间 - type: string + level_list: + description: 会员等级列表 + items: + additionalProperties: true + type: object + type: array + pending_orders_is_can_apply: + description: 存在待处理记录是否允许再次申请提现(0:禁止,1:允许) + type: integer vip_level_limit: description: 提现等级限制 type: integer @@ -3095,15 +3131,6 @@ definitions: description: 标签 ID type: string type: object - md.TagNode: - properties: - tag_id: - description: 标签 ID - type: integer - tag_name: - description: 标签 名称 - type: string - type: object md.TreeNode: properties: avatar_url: @@ -3318,6 +3345,9 @@ definitions: type: object md.UpdateWithdrawSettingReq: properties: + condition_is_open: + description: 提现条件是否开启(0:关闭, 1:开启) + type: integer first_withdraw_set: allOf: - $ref: '#/definitions/md.FirstWithdrawSet' @@ -3340,6 +3370,9 @@ definitions: is_support_decimal_point: description: 是否支持小数点(0:否 1:是) type: integer + pending_orders_is_can_apply: + description: 存在待处理记录是否允许再次申请提现(0:禁止,1:允许) + type: integer vip_level_limit: description: 提现等级限制 type: integer @@ -3859,7 +3892,7 @@ definitions: tag: description: 会员标签 items: - $ref: '#/definitions/md.TagNode' + $ref: '#/definitions/applet_app_md_member_center.TagNode' type: array wechat: description: 微信号 diff --git a/go.mod b/go.mod index 342e0c8..e892c91 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( ) require ( - code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241130022153-9f7ff6c9f078 + code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241129101501-6bf3ba96c5b1 code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241129071929-add8a8e2196a 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