From e304c090c0a4e900b9b783bd146788a13e99ad72 Mon Sep 17 00:00:00 2001 From: shenjiachi Date: Mon, 25 Nov 2024 15:47:25 +0800 Subject: [PATCH] update --- app/hdl/financial_center/hdl_withdraw.go | 17 ++------ app/md/financial_center/md_withdraw.go | 54 ++++++++++++------------ 2 files changed, 29 insertions(+), 42 deletions(-) diff --git a/app/hdl/financial_center/hdl_withdraw.go b/app/hdl/financial_center/hdl_withdraw.go index 348483a..aa0574e 100644 --- a/app/hdl/financial_center/hdl_withdraw.go +++ b/app/hdl/financial_center/hdl_withdraw.go @@ -4,10 +4,8 @@ import ( "applet/app/db" "applet/app/e" md "applet/app/md/financial_center" - "applet/app/utils" "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" "code.fnuoos.com/EggPlanet/egg_models.git/src/model" - md2 "code.fnuoos.com/EggPlanet/egg_system_rules.git/rule/egg_energy/md" "github.com/gin-gonic/gin" "time" ) @@ -32,13 +30,8 @@ func GetWithdrawSetting(c *gin.Context) { // 不存在则初始化 if setting == nil { now := time.Now() - frequency := md2.WithdrawFrequencySetStruct{ - Day: 0, - Times: 0, - } - frequencyStr := utils.SerializeStr(frequency) m := model.FinWithdrawSetting{ - FrequencySet: frequencyStr, + FrequencySet: "", WithdrawType: 0, VipLevelLimit: 0, IsRealName: 0, @@ -64,12 +57,9 @@ func GetWithdrawSetting(c *gin.Context) { return } } - - var frequency md2.WithdrawFrequencySetStruct - utils.Unserialize([]byte(setting.FrequencySet), &frequency) resp := md.GetWithdrawSettingResp{ Id: setting.Id, - FrequencySet: frequency, + FrequencySet: setting.FrequencySet, WithdrawType: setting.WithdrawType, VipLevelLimit: setting.VipLevelLimit, IsRealName: setting.IsRealName, @@ -105,10 +95,9 @@ func UpdateWithdrawSetting(c *gin.Context) { return } - frequencyStr := utils.SerializeStr(req.FrequencySet) m := model.FinWithdrawSetting{ Id: req.Id, - FrequencySet: frequencyStr, + FrequencySet: req.FrequencySet, WithdrawType: req.WithdrawType, VipLevelLimit: req.VipLevelLimit, IsRealName: req.IsRealName, diff --git a/app/md/financial_center/md_withdraw.go b/app/md/financial_center/md_withdraw.go index 6db6e44..00fbcb9 100644 --- a/app/md/financial_center/md_withdraw.go +++ b/app/md/financial_center/md_withdraw.go @@ -1,35 +1,33 @@ package md -import "code.fnuoos.com/EggPlanet/egg_system_rules.git/rule/egg_energy/md" - type GetWithdrawSettingResp struct { - Id int64 `json:"id"` - FrequencySet md.WithdrawFrequencySetStruct `json:"frequency_set"` // 频率设置 x 天提现 y 次 - 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:是) - WithdrawTimeInterval string `json:"withdraw_time_interval"` // 提现时段 - WithdrawFeeSet string `json:"withdraw_fee_set"` // 提现手续费设置 - CreateAt string `json:"create_at"` // 申请时间 - UpdateAt string `json:"update_at"` // 处理时间 + Id int64 `json:"id"` + FrequencySet string `json:"frequency_set"` // 频率设置 + 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:是) + WithdrawTimeInterval string `json:"withdraw_time_interval"` // 提现时段 + WithdrawFeeSet string `json:"withdraw_fee_set"` // 提现手续费设置 + CreateAt string `json:"create_at"` // 申请时间 + UpdateAt string `json:"update_at"` // 处理时间 } type UpdateWithdrawSettingReq struct { - Id int64 `json:"id,required"` - FrequencySet md.WithdrawFrequencySetStruct `json:"frequency_set"` // 频率设置 x 天提现 y 次 - 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:是) - WithdrawTimeInterval string `json:"withdraw_time_interval"` // 提现时段 - WithdrawFeeSet string `json:"withdraw_fee_set"` // 提现手续费设置 + Id int64 `json:"id,required"` + FrequencySet string `json:"frequency_set"` // 频率设置 + 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:是) + WithdrawTimeInterval string `json:"withdraw_time_interval"` // 提现时段 + WithdrawFeeSet string `json:"withdraw_fee_set"` // 提现手续费设置 }