Merge remote-tracking branch 'origin/master'

app/hdl/financial_center/hdl_withdraw.go

@@ -38,7 +38,12 @@ func GetWithdrawSetting(c *gin.Context) {
 			Duration: 0,
 			Num:      emptyNum,
 		}
+		withdrawFeeSet := md2.WithdrawFeeSetStruct{
+			Kind:  0,
+			Value: 0,
+		}
 		frequencyStr := utils.SerializeStr(frequency)
+		withdrawFeeSetStr := utils.SerializeStr(withdrawFeeSet)
 		m := model.FinWithdrawSetting{
 			FrequencySet:          frequencyStr,
 			WithdrawType:          0,
@@ -50,7 +55,7 @@ func GetWithdrawSetting(c *gin.Context) {
 			IsSupportDecimalPoint: 0,
 			IsAuto:                0,
 			WithdrawTimeInterval:  "",
-			WithdrawFeeSet:        "",
+			WithdrawFeeSet:        withdrawFeeSetStr,
 			CreateAt:              now.Format("2006-01-02 15:04:05"),
 			UpdateAt:              "",
 		}
@@ -67,7 +72,9 @@ func GetWithdrawSetting(c *gin.Context) {
 		}
 	}
 	var frequency md2.WithdrawFrequencySettingStruct
+	var withdrawFeeSet md2.WithdrawFeeSetStruct
 	utils.Unserialize([]byte(setting.FrequencySet), &frequency)
+	utils.Unserialize([]byte(setting.WithdrawFeeSet), &withdrawFeeSet)
 	resp := md.GetWithdrawSettingResp{
 		Id:                    setting.Id,
 		FrequencySet:          frequency,
@@ -80,7 +87,7 @@ func GetWithdrawSetting(c *gin.Context) {
 		IsSupportDecimalPoint: setting.IsSupportDecimalPoint,
 		IsAuto:                setting.IsAuto,
 		WithdrawTimeInterval:  setting.WithdrawTimeInterval,
-		WithdrawFeeSet:        setting.WithdrawFeeSet,
+		WithdrawFeeSet:        withdrawFeeSet,
 		CreateAt:              setting.CreateAt,
 		UpdateAt:              setting.UpdateAt,
 	}
@@ -106,6 +113,7 @@ func UpdateWithdrawSetting(c *gin.Context) {
 		return
 	}
 	frequencyStr := utils.SerializeStr(req.FrequencySet)
+	withdrawFeeSetStr := utils.SerializeStr(req.WithdrawFeeSet)
 	m := model.FinWithdrawSetting{
 		Id:                    req.Id,
 		FrequencySet:          frequencyStr,
@@ -118,7 +126,7 @@ func UpdateWithdrawSetting(c *gin.Context) {
 		IsSupportDecimalPoint: req.IsSupportDecimalPoint,
 		IsAuto:                req.IsAuto,
 		WithdrawTimeInterval:  req.WithdrawTimeInterval,
-		WithdrawFeeSet:        req.WithdrawFeeSet,
+		WithdrawFeeSet:        withdrawFeeSetStr,
 	}
 
 	forceColumns := []string{"withdraw_type", "is_real_name", "withdraw_nums_limit", "withdraw_amount_limit", "withdraw_multiple_limit", "is_support_decimal_point", "is_auto"}

app/md/financial_center/md_withdraw.go

@@ -20,7 +20,7 @@ type GetWithdrawSettingResp struct {
 	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"`         // 提现手续费设置
+	WithdrawFeeSet        md.WithdrawFeeSetStruct           `json:"withdraw_fee_set"`         // 提现手续费设置
 	CreateAt              string                            `json:"create_at"`                // 申请时间
 	UpdateAt              string                            `json:"update_at"`                // 处理时间
 }
@@ -37,7 +37,7 @@ type UpdateWithdrawSettingReq struct {
 	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"`         // 提现手续费设置
+	WithdrawFeeSet        md.WithdrawFeeSetStruct           `json:"withdraw_fee_set"`         // 提现手续费设置
 }
 type GetWithdrawApplyListReq struct {
 	Uid             string `json:"uid"`              // 用户 ID

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/go-playground/universal-translator v0.18.1
 	github.com/go-playground/validator/v10 v10.20.0
 	github.com/go-redis/redis v6.15.9+incompatible
-	github.com/gomodule/redigo v1.9.2
+	github.com/gomodule/redigo v2.0.0+incompatible
 	github.com/iGoogle-ink/gopay v1.5.36
 	github.com/makiuchi-d/gozxing v0.0.0-20210324052758-57132e828831
 	github.com/qiniu/api.v7/v7 v7.8.2
@@ -34,12 +34,14 @@ require (
 
 require (
 	code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241128093644-212e906d846c
-	code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241128093118-1efc428b8a55
+	code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241128100543-0057e61676e7
 	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
 	github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
+	github.com/gin-contrib/sessions v1.0.1
 	github.com/go-pay/gopay v1.5.106
+	github.com/go-pay/xlog v0.0.3
 	github.com/go-sql-driver/mysql v1.8.1
 	github.com/gocolly/colly v1.2.0
 	github.com/olivere/elastic/v7 v7.0.32
@@ -69,7 +71,6 @@ require (
 	github.com/go-openapi/spec v0.20.11 // indirect
 	github.com/go-openapi/swag v0.19.15 // indirect
 	github.com/go-pay/crypto v0.0.1 // indirect
-	github.com/go-pay/xlog v0.0.3 // indirect
 	github.com/go-pay/xtime v0.0.2 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect