update

controllers/guangzuan/tradeService.go

@@ -18,8 +18,8 @@ import (
 // @Security Group
 // @Param    userid   query    int    true  "用户ID"
 // @Param    executestatus query    int false "执行状态 - 1:未生效 2:进行中 3:已结束"
-// @Param    page     query    int    false "页码"
-// @Param    pagesize query    int    false "每页条数"
+// @Param    page          query    int false "页码"
+// @Param    pagesize      query    int false "每页条数"
 // @Success  200           {array}  models.GzcjjcorderM
 // @Failure  500     {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrder [get]
@@ -39,8 +39,8 @@ func QueryGZCJJCOrder(c *gin.Context) {
 // @Security Group
 // @Param    userid        query    int true  "用户ID"
 // @Param    orderid  query    string false "单据ID"
-// @Param    page          query    int false "页码"
-// @Param    pagesize      query    int false "每页条数"
+// @Param    page     query    int    false "页码"
+// @Param    pagesize query    int    false "每页条数"
 // @Success  200      {array}  models.GzcjjcorderdetailM
 // @Failure  500           {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrderDetail [get]

docs/docs.go

@@ -48310,16 +48310,6 @@ const docTemplate = `{
         "models.PaymentCenterHybridConfig": {
             "type": "object",
             "properties": {
-                "bank_infos": {
-                    "description": "混合支付银行信息列表",
-                    "type": "object",
-                    "additionalProperties": {
-                        "type": "array",
-                        "items": {
-                            "$ref": "#/definitions/models.Hybridbankinfo"
-                        }
-                    }
-                },
                 "can_amt_in": {
                     "description": "入金是否可用 0-不可用 1-可用",
                     "type": "integer"
@@ -48335,6 +48325,26 @@ const docTemplate = `{
                 "channel_name": {
                     "description": "渠道名称",
                     "type": "string"
+                },
+                "in_bank_infos": {
+                    "description": "入金银行信息列表",
+                    "type": "object",
+                    "additionalProperties": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/definitions/models.Hybridbankinfo"
+                        }
+                    }
+                },
+                "out_bank_infos": {
+                    "description": "出金银行信息列表",
+                    "type": "object",
+                    "additionalProperties": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/definitions/models.Hybridbankinfo"
+                        }
+                    }
                 }
             }
         },

docs/swagger.json

@@ -48301,16 +48301,6 @@
         "models.PaymentCenterHybridConfig": {
             "type": "object",
             "properties": {
-                "bank_infos": {
-                    "description": "混合支付银行信息列表",
-                    "type": "object",
-                    "additionalProperties": {
-                        "type": "array",
-                        "items": {
-                            "$ref": "#/definitions/models.Hybridbankinfo"
-                        }
-                    }
-                },
                 "can_amt_in": {
                     "description": "入金是否可用 0-不可用 1-可用",
                     "type": "integer"
@@ -48326,6 +48316,26 @@
                 "channel_name": {
                     "description": "渠道名称",
                     "type": "string"
+                },
+                "in_bank_infos": {
+                    "description": "入金银行信息列表",
+                    "type": "object",
+                    "additionalProperties": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/definitions/models.Hybridbankinfo"
+                        }
+                    }
+                },
+                "out_bank_infos": {
+                    "description": "出金银行信息列表",
+                    "type": "object",
+                    "additionalProperties": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/definitions/models.Hybridbankinfo"
+                        }
+                    }
                 }
             }
         },

docs/swagger.yaml

@@ -17900,13 +17900,6 @@ definitions:
     type: object
   models.PaymentCenterHybridConfig:
     properties:
-      bank_infos:
-        additionalProperties:
-          items:
-            $ref: '#/definitions/models.Hybridbankinfo'
-          type: array
-        description: 混合支付银行信息列表
-        type: object
       can_amt_in:
         description: 入金是否可用 0-不可用 1-可用
         type: integer
@@ -17919,6 +17912,20 @@ definitions:
       channel_name:
         description: 渠道名称
         type: string
+      in_bank_infos:
+        additionalProperties:
+          items:
+            $ref: '#/definitions/models.Hybridbankinfo'
+          type: array
+        description: 入金银行信息列表
+        type: object
+      out_bank_infos:
+        additionalProperties:
+          items:
+            $ref: '#/definitions/models.Hybridbankinfo'
+          type: array
+        description: 出金银行信息列表
+        type: object
     type: object
   models.PresaleAuction:
     properties:

models/bank.go

@@ -192,7 +192,8 @@ type PaymentCenterHybridConfig struct {
 	CAN_AMT_IN   int32  `json:"can_amt_in"`   // 入金是否可用 0-不可用 1-可用
 	CAN_AMT_OUT  int32  `json:"can_amt_out"`  // 出金是否可用 0-不可用 1-可用
 
-	BankInfos map[string][]Hybridbankinfo `json:"bank_infos"` // 混合支付银行信息列表
+	InBankInfos  map[string][]Hybridbankinfo `json:"in_bank_infos"`  // 入金银行信息列表
+	OutBankInfos map[string][]Hybridbankinfo `json:"out_bank_infos"` // 出金银行信息列表
 }
 
 func GetPaymentCenterHybridConfig() (paymentCenterHybridConfigs []PaymentCenterHybridConfig, err error) {
@@ -212,16 +213,27 @@ func GetPaymentCenterHybridConfig() (paymentCenterHybridConfigs []PaymentCenterH
 			CAN_AMT_OUT:  item.CAN_AMT_OUT,
 		}
 
-		datas := make([]Hybridbankinfo, 0)
-		if err = engine.Where("CHANNEL_CODE = ? AND IS_ENABLED = 1", item.CHANNEL_CODE).Find(&datas); err != nil {
+		// 入金银行信息
+		in_datas := make([]Hybridbankinfo, 0)
+		if err = engine.Where("CHANNEL_CODE = ? AND  OUT_IN_FLAG = 1 AND IS_ENABLED = 1", item.CHANNEL_CODE).Find(&in_datas); err != nil {
 			return
 		}
-		m := make(map[string][]Hybridbankinfo)
-		for _, data := range datas {
-			m[data.METHOD_TYPE] = append(m[data.METHOD_TYPE], data)
+		in := make(map[string][]Hybridbankinfo)
+		for _, data := range in_datas {
+			in[data.METHOD_TYPE] = append(in[data.METHOD_TYPE], data)
 		}
+		paymentCenterHybridConfig.InBankInfos = in
 
-		paymentCenterHybridConfig.BankInfos = m
+		// 出金银行信息
+		out_datas := make([]Hybridbankinfo, 0)
+		if err = engine.Where("CHANNEL_CODE = ? AND  OUT_IN_FLAG = 0 AND IS_ENABLED = 1", item.CHANNEL_CODE).Find(&out_datas); err != nil {
+			return
+		}
+		out := make(map[string][]Hybridbankinfo)
+		for _, data := range out_datas {
+			out[data.METHOD_TYPE] = append(out[data.METHOD_TYPE], data)
+		}
+		paymentCenterHybridConfig.OutBankInfos = out
 
 		paymentCenterHybridConfigs = append(paymentCenterHybridConfigs, paymentCenterHybridConfig)
 	}