Merge remote-tracking branch 'origin/master'

app/hdl/financial_center/hdl_withdraw.go

@@ -397,6 +397,16 @@ func GetWithdrawApplyList(c *gin.Context) {
 	}
 
 	resp := md.GetWithdrawApplyListResp{
+		AuditList: []map[string]interface{}{
+			{
+				"value": 1,
+				"name":  "同意",
+			},
+			{
+				"value": 2,
+				"name":  "拒绝",
+			},
+		},
 		ReasonList: []map[string]interface{}{
 			{
 				"value": enum.FinWithdrawApplyReasonForNotRule,

app/md/financial_center/md_withdraw.go

@@ -91,6 +91,7 @@ type WithdrawApplyInfo struct {
 }
 
 type GetWithdrawApplyListResp struct {
+	AuditList         []map[string]interface{}   `json:"audit_list"`         // 审核条件
 	ReasonList        []map[string]interface{}   `json:"reason_list"`        // 审核失败（驳回理由）
 	LevelsList        []map[string]interface{}   `json:"levels_list"`        // 等级列表
 	TagsList          []map[string]interface{}   `json:"tags_list"`          // 标签列表

app/md/md_module.go

@@ -16,6 +16,8 @@ var Module = map[string]string{
 	"13": "withdraw_account",
 	"14": "user_real_name",
 	"15": "website_about_us",
+	"16": "star_sword_debate",
+	"17": "upgrade_strategy",
 }
 var ModuleList = []map[string]interface{}{
 	{"name": "首页", "mod_name": "home_page", "value": "1"},
@@ -33,4 +35,6 @@ var ModuleList = []map[string]interface{}{
 	{"name": "提现到账户", "mod_name": "withdraw_account", "value": "13"},
 	{"name": "实名认证", "mod_name": "user_real_name", "value": "14"},
 	{"name": "官网联系我们", "mod_name": "website_about_us", "value": "15"},
+	{"name": "星球论剑", "mod_name": "star_sword_debate", "value": "16"},
+	{"name": "升级攻略", "mod_name": "upgrade_strategy", "value": "17"},
 }

docs/docs.go

@@ -1,5 +1,4 @@
-// Code generated by swaggo/swag. DO NOT EDIT.
-
+// Package docs Code generated by swaggo/swag. DO NOT EDIT
 package docs
 
 import "github.com/swaggo/swag"
@@ -1656,9 +1655,7 @@ const docTemplate = `{
                         "name": "req",
                         "in": "body",
                         "required": true,
-                        "schema": {
-                            "type": "object"
-                        }
+                        "schema": {}
                     }
                 ],
                 "responses": {
@@ -13622,6 +13619,14 @@ const docTemplate = `{
         "md.GetWithdrawApplyListResp": {
             "type": "object",
             "properties": {
+                "audit_list": {
+                    "description": "审核条件",
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "additionalProperties": true
+                    }
+                },
                 "levels_list": {
                     "description": "等级列表",
                     "type": "array",
@@ -16838,6 +16843,9 @@ const docTemplate = `{
                     "description": "头像",
                     "type": "string"
                 },
+                "custom_invite_code": {
+                    "type": "string"
+                },
                 "id": {
                     "description": "会员 ID",
                     "type": "integer"
@@ -17755,6 +17763,8 @@ var SwaggerInfo = &swag.Spec{
 	Description:      "管理后台接口文档",
 	InfoInstanceName: "swagger",
 	SwaggerTemplate:  docTemplate,
+	LeftDelim:        "{{",
+	RightDelim:       "}}",
 }
 
 func init() {

docs/swagger.json

@@ -1648,9 +1648,7 @@
                         "name": "req",
                         "in": "body",
                         "required": true,
-                        "schema": {
-                            "type": "object"
-                        }
+                        "schema": {}
                     }
                 ],
                 "responses": {
@@ -13614,6 +13612,14 @@
         "md.GetWithdrawApplyListResp": {
             "type": "object",
             "properties": {
+                "audit_list": {
+                    "description": "审核条件",
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "additionalProperties": true
+                    }
+                },
                 "levels_list": {
                     "description": "等级列表",
                     "type": "array",
@@ -16830,6 +16836,9 @@
                     "description": "头像",
                     "type": "string"
                 },
+                "custom_invite_code": {
+                    "type": "string"
+                },
                 "id": {
                     "description": "会员 ID",
                     "type": "integer"

docs/swagger.yaml

@@ -2663,6 +2663,12 @@ definitions:
     type: object
   md.GetWithdrawApplyListResp:
     properties:
+      audit_list:
+        description: 审核条件
+        items:
+          additionalProperties: true
+          type: object
+        type: array
       levels_list:
         description: 等级列表
         items:
@@ -4897,6 +4903,8 @@ definitions:
       avatar:
         description: 头像
         type: string
+      custom_invite_code:
+        type: string
       id:
         description: 会员 ID
         type: integer
@@ -6605,8 +6613,7 @@ paths:
         in: body
         name: req
         required: true
-        schema:
-          type: object
+        schema: {}
       produces:
       - application/json
       responses:

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 v2.0.0+incompatible
+	github.com/gomodule/redigo v1.9.2
 	github.com/jinzhu/copier v0.4.0
 	github.com/makiuchi-d/gozxing v0.0.0-20210324052758-57132e828831
 	github.com/qiniu/api.v7/v7 v7.8.2
@@ -34,7 +34,7 @@ require (
 
 require (
 	code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241220110855-5eeb26f6c25b
-	code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241220073933-42987f91e880
+	code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241223150004-6bb07a3d2934
 	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
@@ -44,7 +44,6 @@ require (
 	github.com/alibabacloud-go/tea v1.2.2
 	github.com/alibabacloud-go/tea-utils/v2 v2.0.6
 	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.98
 	github.com/go-sql-driver/mysql v1.8.1
 	github.com/gocolly/colly v1.2.0