浏览代码

接口 /Bank/QueryHybridReceiverOnboards 增加银行支行出参

muchinfo 7 月之前
父节点
当前提交
cc00e577ca
共有 5 个文件被更改,包括 22 次插入5 次删除
  1. 4 4
      controllers/guangzuan/tradeService.go
  2. 4 0
      docs/docs.go
  3. 4 0
      docs/swagger.json
  4. 3 0
      docs/swagger.yaml
  5. 7 1
      models/bank.go

+ 4 - 4
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]

+ 4 - 0
docs/docs.go

@@ -43238,6 +43238,10 @@ const docTemplate = `{
                     "description": "银行名称",
                     "type": "string"
                 },
+                "bankbranch": {
+                    "description": "银行支行名称",
+                    "type": "string"
+                },
                 "cert_no": {
                     "description": "证件号码",
                     "type": "string"

+ 4 - 0
docs/swagger.json

@@ -43229,6 +43229,10 @@
                     "description": "银行名称",
                     "type": "string"
                 },
+                "bankbranch": {
+                    "description": "银行支行名称",
+                    "type": "string"
+                },
                 "cert_no": {
                     "description": "证件号码",
                     "type": "string"

+ 3 - 0
docs/swagger.yaml

@@ -14147,6 +14147,9 @@ definitions:
       bank_name:
         description: 银行名称
         type: string
+      bankbranch:
+        description: 银行支行名称
+        type: string
       cert_no:
         description: 证件号码
         type: string

+ 7 - 1
models/bank.go

@@ -251,6 +251,7 @@ type Hybridreceiveronboard struct {
 	TELNUMBER    string `json:"phone_number" xorm:"TELNUMBER"`     // 电话号码
 	BANK         string `json:"bank_code" xorm:"BANK"`             // 银行代码
 	BANKACCOUNT  string `json:"bank_account" xorm:"BANKACCOUNT"`   // 银行卡号
+	BANKBRANCH   string `json:"bankbranch" xorm:"BANKBRANCH"`      // 银行支行名称
 
 	BANK_NAME   string `json:"bank_name" xorm:"BANK_NAME"`     // 银行名称
 	METHOD_TYPE string `json:"method_type" xorm:"METHOD_TYPE"` // 银行卡号
@@ -258,7 +259,11 @@ type Hybridreceiveronboard struct {
 	USERID int64 `json:"-" xorm:"-"` // 用户ID
 }
 
-func (r *Hybridreceiveronboard) calc() {}
+func (r *Hybridreceiveronboard) calc() {
+	if r.CHANNEL_CODE == "mypay" {
+		r.BANK_NAME = r.BANK
+	}
+}
 
 func (r *Hybridreceiveronboard) buildSql() string {
 	var sqlId utils.SQLVal = `
@@ -277,6 +282,7 @@ select
   t.datemodified,
   t.relationship,
   t.status, 
+  t.bankbranch,
   b.bank_name,
   b.method_type
 from HYBRID_RECEIVERONBOARD t