/Qhj/QueryBankAccountSign

查询签约银行信息(提现账户管理) 增加托管银行名称出参

config/config.xml

@@ -13,11 +13,11 @@
     <DbAddress value="192.168.31.88"/>
     <DbName value="orcl"/>
     <DbPort value="1521"/>
-    <DbUser value="mtp2_test167"/>
+    <DbUser value="mtp2_test201"/>
     <DbPwd value="muchinfo"/>
   </DbSetting>
   <RedisSetting>
-    <Address value="192.168.31.167"/>
+    <Address value="192.168.31.201"/>
     <Port value="5007"/>
     <Timeout value="3"/>
     <ConnNum value="1"/>
@@ -25,11 +25,11 @@
     <Pwd value=""/>
   </RedisSetting>
   <MqSetting>
-    <Url value="amqp://guest:guest@192.168.31.167:5020/test"/>
+    <Url value="amqp://guest:guest@192.168.31.201:5020/test"/>
     <Exchange value="entry"/>
   </MqSetting>
   <MongoDBSetting>
-    <HostName value="192.168.31.167"/>
+    <HostName value="192.168.31.201"/>
     <Port value="5025"/>
     <DBName value="HistoryQuote"/>
     <Username value="quote_test01"/>
@@ -38,8 +38,8 @@
   <MySQLSetting>
     <Host value="192.168.30.72"/>
     <Port value="3306"/>
-    <DBName value="historyquote_test167"/>
-    <Username value="quote_test167"/>
+    <DBName value="historyquote_test201"/>
+    <Username value="quote_test201"/>
     <Password value="123456"/>
   </MySQLSetting>
 </Configuration>

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

@@ -39120,6 +39120,10 @@ const docTemplate = `{
                     "description": "托管银行编号",
                     "type": "string"
                 },
+                "cusbankname": {
+                    "description": "托管银行名称",
+                    "type": "string"
+                },
                 "direct": {
                     "description": "方向(可以判断那方先发起的签约)",
                     "type": "integer"

docs/swagger.json

@@ -39111,6 +39111,10 @@
                     "description": "托管银行编号",
                     "type": "string"
                 },
+                "cusbankname": {
+                    "description": "托管银行名称",
+                    "type": "string"
+                },
                 "direct": {
                     "description": "方向(可以判断那方先发起的签约)",
                     "type": "integer"

docs/swagger.yaml

@@ -14796,6 +14796,9 @@ definitions:
       cusbankid:
         description: 托管银行编号
         type: string
+      cusbankname:
+        description: 托管银行名称
+        type: string
       direct:
         description: 方向(可以判断那方先发起的签约)
         type: integer

models/qhj.go

@@ -883,6 +883,8 @@ type QhjBankAccountSign struct {
 	RELATEDUSERID    int64  `json:"relateduserid"  xorm:"'RELATEDUSERID'"`     // 关联使用者userid
 	BANKNAME         string `json:"bankname"  xorm:"'BANKNAME'"`               // 签约银行名称
 
+	CUSBANKNAME string `json:"cusbankname"  xorm:"CUSBANKNAME"` // 托管银行名称
+
 	ACCOUNTNAME2     string `json:"accountname2"`     // 资金账号对应的账号名(UserName) - 密文
 	BANKACCOUNTNAME2 string `json:"bankaccountname2"` // 签约银行卡账号名 - 密文
 	CARDNO2          string `json:"cardno2"`          // 证件号码 - 密文
@@ -935,11 +937,13 @@ func (r *QhjBankAccountSign) buildSql() string {
 		"       t.APPLYEXCHTICKET," +
 		"       ta.accountid," +
 		"       ta.relateduserid," +
-		"       b.bankname" +
+		"       b.bankname," +
+		"       ci.cusbankname" +
 		"  FROM BANK_ACCOUNTSIGN t" +
 		" INNER JOIN TAACCOUNT ta" +
 		"    on t.accountcode = to_char(ta.accountid)" +
 		" LEFT JOIN BANK_BANKINFO b on t.bankid=b.bankid" +
+		" LEFT JOIN bank_cusbankinfo ci ON ci.cusbankid = t.CUSBANKID" +
 		" WHERE 1 = 1" +
 		"   and ta.taaccounttype = 2"
 	sqlId.And("ta.RELATEDUSERID", r.RELATEDUSERID)