1.增加查询充值提现接口

controllers/qhj/qryQhj.go

@@ -303,3 +303,45 @@ func QuerySiteColumnDetail(c *gin.Context) {
 	m := models.QhjSiteColumnDetail{USERID: req.USERID}
 	a.DoGetDataI(&m)
 }
+
+// QueryAccountInOutApply
+// @Summary 查询充值提现
+// @Produce json
+// @Security ApiKeyAuth
+// @Param begindate query string false "申请起始日期(格式yyyymmdd)"
+// @Param enddate query string false "申请截止日期(格式yyyymmdd)"
+// @Param likename query string false "模糊搜索名称"
+// @Success 200 {array} models.QhjAccountOutInApply
+// @Failure 500 {object} app.Response
+// @Router /Qhj/QueryAccountInOutApply [get]
+// @Tags 大连千海金
+func QueryAccountInOutApply(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	req := struct {
+		BEGINDATE string `form:"begindate"` // 开始申请日期
+		ENDDATE   string `form:"enddate"`   // 结束申请日期
+		LIKENAME  string `form:"likename"`  // 模糊搜索名称
+	}{}
+	a.DoBindReq(&req)
+	a.CheckParamF(func() bool {
+		if len(req.BEGINDATE) > 0 && len(req.BEGINDATE) != 8 {
+			return false
+		}
+		if len(req.ENDDATE) > 0 && len(req.ENDDATE) != 8 {
+			return false
+		}
+		for i := range req.BEGINDATE {
+			if req.BEGINDATE[i] < '0' || req.BEGINDATE[i] > '9' {
+				return false
+			}
+		}
+		for i := range req.ENDDATE {
+			if req.ENDDATE[i] < '0' || req.ENDDATE[i] > '9' {
+				return false
+			}
+		}
+		return true
+	})
+	m := models.QhjAccountOutInApply{BeginDate: req.BEGINDATE, EndDate: req.ENDDATE, FilterName: req.LIKENAME}
+	a.DoGetDataI(&m)
+}

docs/docs.go

@@ -6739,6 +6739,59 @@ var doc = `{
                 }
             }
         },
+        "/Qhj/QueryAccountInOutApply": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "大连千海金"
+                ],
+                "summary": "查询充值提现",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "申请起始日期(格式yyyymmdd)",
+                        "name": "begindate",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "申请截止日期(格式yyyymmdd)",
+                        "name": "enddate",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "模糊搜索名称",
+                        "name": "likename",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.QhjAccountOutInApply"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Qhj/QueryBankAccountSign": {
             "get": {
                 "security": [
@@ -20656,6 +20709,179 @@ var doc = `{
                 }
             }
         },
+        "models.QhjAccountOutInApply": {
+            "type": "object",
+            "properties": {
+                "accountcode": {
+                    "description": "资金账号",
+                    "type": "string"
+                },
+                "accountname": {
+                    "description": "用户名称(名称)",
+                    "type": "string"
+                },
+                "accountpwd": {
+                    "description": "资金密码",
+                    "type": "string"
+                },
+                "accountticket": {
+                    "description": "最新账户服务流水号",
+                    "type": "string"
+                },
+                "amount": {
+                    "description": "金额",
+                    "type": "number"
+                },
+                "applyremark": {
+                    "description": "申请备注",
+                    "type": "string"
+                },
+                "applystatus": {
+                    "description": "申请状态 - 1:待审核 2:待复审 3:初审拒绝 4:交易冻结中 5:交易解冻中 6:交易解冻扣款中 7:交易入金中 8:交易冻结/解冻/扣款中(银行发起出金时用) 9:银行出金中 10:银行入金中 11:成功 12:失败 13:银行审核中  14:账户服务入金失败； 15:账户服务解冻失败； 16:账户服务解冻扣款失败； 17:账户服务出金失败 18:复审通过 19:复审拒绝 20:提交审核，账户冻结中 21:审核拒绝，账户解冻中；22: 待审核，账户服务解冻回滚中； 23：待复审，账户服务解冻回滚中； 24： 审核通过，账户冻结金额检查中；25： 复审通过，账户冻结金额检查中；",
+                    "type": "integer"
+                },
+                "auditid": {
+                    "description": "审核人",
+                    "type": "integer"
+                },
+                "audittime": {
+                    "description": "审核时间",
+                    "type": "string"
+                },
+                "bank_apply_ticket": {
+                    "description": "银行申请流水",
+                    "type": "string"
+                },
+                "bankaccountname": {
+                    "description": "银行账户名",
+                    "type": "string"
+                },
+                "bankaccountno": {
+                    "description": "银行卡号",
+                    "type": "string"
+                },
+                "bankid": {
+                    "description": "银行编号",
+                    "type": "string"
+                },
+                "bankticket": {
+                    "description": "银行流水",
+                    "type": "string"
+                },
+                "branchbankid": {
+                    "description": "银行支行号",
+                    "type": "string"
+                },
+                "branchbankname": {
+                    "description": "银行支行名称",
+                    "type": "string"
+                },
+                "capamountout": {
+                    "description": "出金(劣后本金) - 外部子账户",
+                    "type": "number"
+                },
+                "certificatephotourl": {
+                    "description": "凭证地址",
+                    "type": "string"
+                },
+                "charge": {
+                    "description": "手续费",
+                    "type": "number"
+                },
+                "checkerrorflag": {
+                    "description": "对账差错标志 - 1:为单边账;其它为正常出入金",
+                    "type": "integer"
+                },
+                "currency": {
+                    "description": "币种",
+                    "type": "string"
+                },
+                "cusbankid": {
+                    "description": "托管银行编号",
+                    "type": "string"
+                },
+                "exchticket": {
+                    "description": "银行服务流水号",
+                    "type": "string"
+                },
+                "executetype": {
+                    "description": "申请类型 - 1:出金 2:入金 3: 单边账调整:入金; 4:单边账调整:出金 5:外部母账户调整:入金 6:外部母账户调整:出金 7:外部子账户:入金 8:外部子账户:出金",
+                    "type": "integer"
+                },
+                "extendinfo": {
+                    "description": "扩展信息",
+                    "type": "string"
+                },
+                "extoperateid": {
+                    "description": "交易服务流水号",
+                    "type": "integer"
+                },
+                "infamount": {
+                    "description": "劣后金额(自有)",
+                    "type": "number"
+                },
+                "logincode": {
+                    "description": "登录账号(账号)",
+                    "type": "string"
+                },
+                "netaddr": {
+                    "description": "调转网址",
+                    "type": "string"
+                },
+                "priamount": {
+                    "description": "优先金额(授信)",
+                    "type": "number"
+                },
+                "reauditid": {
+                    "description": "复审人",
+                    "type": "integer"
+                },
+                "reauditremark": {
+                    "description": "复审备注",
+                    "type": "string"
+                },
+                "reaudittime": {
+                    "description": "复审时间",
+                    "type": "string"
+                },
+                "relatedorderid": {
+                    "description": "三方关联ID",
+                    "type": "string"
+                },
+                "remark": {
+                    "description": "备注",
+                    "type": "string"
+                },
+                "remark2": {
+                    "description": "备注(失败原因)",
+                    "type": "string"
+                },
+                "soucreamount": {
+                    "description": "原始出入金金额",
+                    "type": "number"
+                },
+                "soucrecurrencyid": {
+                    "description": "原始出入金币种",
+                    "type": "integer"
+                },
+                "tradedate": {
+                    "description": "交易日(yyyyMMdd)",
+                    "type": "string"
+                },
+                "updatetime": {
+                    "description": "更新时间(申请时间)",
+                    "type": "string"
+                },
+                "userid": {
+                    "description": "用户id",
+                    "type": "integer"
+                },
+                "userinfotype": {
+                    "description": "账户类型 1-个人 2-企业",
+                    "type": "integer"
+                }
+            }
+        },
         "models.QhjBankAccountSign": {
             "type": "object",
             "properties": {

docs/swagger.json

@@ -6723,6 +6723,59 @@
                 }
             }
         },
+        "/Qhj/QueryAccountInOutApply": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "大连千海金"
+                ],
+                "summary": "查询充值提现",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "申请起始日期(格式yyyymmdd)",
+                        "name": "begindate",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "申请截止日期(格式yyyymmdd)",
+                        "name": "enddate",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "模糊搜索名称",
+                        "name": "likename",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.QhjAccountOutInApply"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Qhj/QueryBankAccountSign": {
             "get": {
                 "security": [
@@ -20640,6 +20693,179 @@
                 }
             }
         },
+        "models.QhjAccountOutInApply": {
+            "type": "object",
+            "properties": {
+                "accountcode": {
+                    "description": "资金账号",
+                    "type": "string"
+                },
+                "accountname": {
+                    "description": "用户名称(名称)",
+                    "type": "string"
+                },
+                "accountpwd": {
+                    "description": "资金密码",
+                    "type": "string"
+                },
+                "accountticket": {
+                    "description": "最新账户服务流水号",
+                    "type": "string"
+                },
+                "amount": {
+                    "description": "金额",
+                    "type": "number"
+                },
+                "applyremark": {
+                    "description": "申请备注",
+                    "type": "string"
+                },
+                "applystatus": {
+                    "description": "申请状态 - 1:待审核 2:待复审 3:初审拒绝 4:交易冻结中 5:交易解冻中 6:交易解冻扣款中 7:交易入金中 8:交易冻结/解冻/扣款中(银行发起出金时用) 9:银行出金中 10:银行入金中 11:成功 12:失败 13:银行审核中  14:账户服务入金失败； 15:账户服务解冻失败； 16:账户服务解冻扣款失败； 17:账户服务出金失败 18:复审通过 19:复审拒绝 20:提交审核，账户冻结中 21:审核拒绝，账户解冻中；22: 待审核，账户服务解冻回滚中； 23：待复审，账户服务解冻回滚中； 24： 审核通过，账户冻结金额检查中；25： 复审通过，账户冻结金额检查中；",
+                    "type": "integer"
+                },
+                "auditid": {
+                    "description": "审核人",
+                    "type": "integer"
+                },
+                "audittime": {
+                    "description": "审核时间",
+                    "type": "string"
+                },
+                "bank_apply_ticket": {
+                    "description": "银行申请流水",
+                    "type": "string"
+                },
+                "bankaccountname": {
+                    "description": "银行账户名",
+                    "type": "string"
+                },
+                "bankaccountno": {
+                    "description": "银行卡号",
+                    "type": "string"
+                },
+                "bankid": {
+                    "description": "银行编号",
+                    "type": "string"
+                },
+                "bankticket": {
+                    "description": "银行流水",
+                    "type": "string"
+                },
+                "branchbankid": {
+                    "description": "银行支行号",
+                    "type": "string"
+                },
+                "branchbankname": {
+                    "description": "银行支行名称",
+                    "type": "string"
+                },
+                "capamountout": {
+                    "description": "出金(劣后本金) - 外部子账户",
+                    "type": "number"
+                },
+                "certificatephotourl": {
+                    "description": "凭证地址",
+                    "type": "string"
+                },
+                "charge": {
+                    "description": "手续费",
+                    "type": "number"
+                },
+                "checkerrorflag": {
+                    "description": "对账差错标志 - 1:为单边账;其它为正常出入金",
+                    "type": "integer"
+                },
+                "currency": {
+                    "description": "币种",
+                    "type": "string"
+                },
+                "cusbankid": {
+                    "description": "托管银行编号",
+                    "type": "string"
+                },
+                "exchticket": {
+                    "description": "银行服务流水号",
+                    "type": "string"
+                },
+                "executetype": {
+                    "description": "申请类型 - 1:出金 2:入金 3: 单边账调整:入金; 4:单边账调整:出金 5:外部母账户调整:入金 6:外部母账户调整:出金 7:外部子账户:入金 8:外部子账户:出金",
+                    "type": "integer"
+                },
+                "extendinfo": {
+                    "description": "扩展信息",
+                    "type": "string"
+                },
+                "extoperateid": {
+                    "description": "交易服务流水号",
+                    "type": "integer"
+                },
+                "infamount": {
+                    "description": "劣后金额(自有)",
+                    "type": "number"
+                },
+                "logincode": {
+                    "description": "登录账号(账号)",
+                    "type": "string"
+                },
+                "netaddr": {
+                    "description": "调转网址",
+                    "type": "string"
+                },
+                "priamount": {
+                    "description": "优先金额(授信)",
+                    "type": "number"
+                },
+                "reauditid": {
+                    "description": "复审人",
+                    "type": "integer"
+                },
+                "reauditremark": {
+                    "description": "复审备注",
+                    "type": "string"
+                },
+                "reaudittime": {
+                    "description": "复审时间",
+                    "type": "string"
+                },
+                "relatedorderid": {
+                    "description": "三方关联ID",
+                    "type": "string"
+                },
+                "remark": {
+                    "description": "备注",
+                    "type": "string"
+                },
+                "remark2": {
+                    "description": "备注(失败原因)",
+                    "type": "string"
+                },
+                "soucreamount": {
+                    "description": "原始出入金金额",
+                    "type": "number"
+                },
+                "soucrecurrencyid": {
+                    "description": "原始出入金币种",
+                    "type": "integer"
+                },
+                "tradedate": {
+                    "description": "交易日(yyyyMMdd)",
+                    "type": "string"
+                },
+                "updatetime": {
+                    "description": "更新时间(申请时间)",
+                    "type": "string"
+                },
+                "userid": {
+                    "description": "用户id",
+                    "type": "integer"
+                },
+                "userinfotype": {
+                    "description": "账户类型 1-个人 2-企业",
+                    "type": "integer"
+                }
+            }
+        },
         "models.QhjBankAccountSign": {
             "type": "object",
             "properties": {

docs/swagger.yaml

@@ -8887,6 +8887,139 @@ definitions:
         description: 业务类型,1-期现套利,2-仓单回购,3-现货贸易
         type: integer
     type: object
+  models.QhjAccountOutInApply:
+    properties:
+      accountcode:
+        description: 资金账号
+        type: string
+      accountname:
+        description: 用户名称(名称)
+        type: string
+      accountpwd:
+        description: 资金密码
+        type: string
+      accountticket:
+        description: 最新账户服务流水号
+        type: string
+      amount:
+        description: 金额
+        type: number
+      applyremark:
+        description: 申请备注
+        type: string
+      applystatus:
+        description: '申请状态 - 1:待审核 2:待复审 3:初审拒绝 4:交易冻结中 5:交易解冻中 6:交易解冻扣款中 7:交易入金中
+          8:交易冻结/解冻/扣款中(银行发起出金时用) 9:银行出金中 10:银行入金中 11:成功 12:失败 13:银行审核中  14:账户服务入金失败；
+          15:账户服务解冻失败； 16:账户服务解冻扣款失败； 17:账户服务出金失败 18:复审通过 19:复审拒绝 20:提交审核，账户冻结中 21:审核拒绝，账户解冻中；22:
+          待审核，账户服务解冻回滚中； 23：待复审，账户服务解冻回滚中； 24： 审核通过，账户冻结金额检查中；25： 复审通过，账户冻结金额检查中；'
+        type: integer
+      auditid:
+        description: 审核人
+        type: integer
+      audittime:
+        description: 审核时间
+        type: string
+      bank_apply_ticket:
+        description: 银行申请流水
+        type: string
+      bankaccountname:
+        description: 银行账户名
+        type: string
+      bankaccountno:
+        description: 银行卡号
+        type: string
+      bankid:
+        description: 银行编号
+        type: string
+      bankticket:
+        description: 银行流水
+        type: string
+      branchbankid:
+        description: 银行支行号
+        type: string
+      branchbankname:
+        description: 银行支行名称
+        type: string
+      capamountout:
+        description: 出金(劣后本金) - 外部子账户
+        type: number
+      certificatephotourl:
+        description: 凭证地址
+        type: string
+      charge:
+        description: 手续费
+        type: number
+      checkerrorflag:
+        description: 对账差错标志 - 1:为单边账;其它为正常出入金
+        type: integer
+      currency:
+        description: 币种
+        type: string
+      cusbankid:
+        description: 托管银行编号
+        type: string
+      exchticket:
+        description: 银行服务流水号
+        type: string
+      executetype:
+        description: '申请类型 - 1:出金 2:入金 3: 单边账调整:入金; 4:单边账调整:出金 5:外部母账户调整:入金 6:外部母账户调整:出金
+          7:外部子账户:入金 8:外部子账户:出金'
+        type: integer
+      extendinfo:
+        description: 扩展信息
+        type: string
+      extoperateid:
+        description: 交易服务流水号
+        type: integer
+      infamount:
+        description: 劣后金额(自有)
+        type: number
+      logincode:
+        description: 登录账号(账号)
+        type: string
+      netaddr:
+        description: 调转网址
+        type: string
+      priamount:
+        description: 优先金额(授信)
+        type: number
+      reauditid:
+        description: 复审人
+        type: integer
+      reauditremark:
+        description: 复审备注
+        type: string
+      reaudittime:
+        description: 复审时间
+        type: string
+      relatedorderid:
+        description: 三方关联ID
+        type: string
+      remark:
+        description: 备注
+        type: string
+      remark2:
+        description: 备注(失败原因)
+        type: string
+      soucreamount:
+        description: 原始出入金金额
+        type: number
+      soucrecurrencyid:
+        description: 原始出入金币种
+        type: integer
+      tradedate:
+        description: 交易日(yyyyMMdd)
+        type: string
+      updatetime:
+        description: 更新时间(申请时间)
+        type: string
+      userid:
+        description: 用户id
+        type: integer
+      userinfotype:
+        description: 账户类型 1-个人 2-企业
+        type: integer
+    type: object
   models.QhjBankAccountSign:
     properties:
       accountcode:
@@ -16999,6 +17132,39 @@ paths:
       summary: 持仓汇总查询（合约市场）
       tags:
       - 通用单据
+  /Qhj/QueryAccountInOutApply:
+    get:
+      parameters:
+      - description: 申请起始日期(格式yyyymmdd)
+        in: query
+        name: begindate
+        type: string
+      - description: 申请截止日期(格式yyyymmdd)
+        in: query
+        name: enddate
+        type: string
+      - description: 模糊搜索名称
+        in: query
+        name: likename
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/models.QhjAccountOutInApply'
+            type: array
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      summary: 查询充值提现
+      tags:
+      - 大连千海金
   /Qhj/QueryBankAccountSign:
     get:
       parameters:

models/qhj.go

@@ -1243,3 +1243,129 @@ func (r *QhjSiteColumnDetail) GetDataEx() (interface{}, error) {
 	}
 	return sData, err
 }
+
+// QhjAccountOutInApply 充值提现（出入金）
+type QhjAccountOutInApply struct {
+	EXECUTETYPE         int32   `json:"executetype"  xorm:"EXECUTETYPE"`                 // 申请类型 - 1:出金 2:入金 3: 单边账调整:入金; 4:单边账调整:出金 5:外部母账户调整:入金 6:外部母账户调整:出金 7:外部子账户:入金 8:外部子账户:出金
+	AMOUNT              float64 `json:"amount"  xorm:"AMOUNT"`                           // 金额
+	CURRENCY            string  `json:"currency"  xorm:"CURRENCY"`                       // 币种
+	CHARGE              float64 `json:"charge"  xorm:"CHARGE"`                           // 手续费
+	ACCOUNTPWD          string  `json:"accountpwd"  xorm:"ACCOUNTPWD"`                   // 资金密码
+	UPDATETIME          string  `json:"updatetime"  xorm:"UPDATETIME"`                   // 更新时间(申请时间)
+	BANKID              string  `json:"bankid"  xorm:"BANKID"`                           // 银行编号
+	BRANCHBANKID        string  `json:"branchbankid"  xorm:"BRANCHBANKID"`               // 银行支行号
+	BRANCHBANKNAME      string  `json:"branchbankname"  xorm:"BRANCHBANKNAME"`           // 银行支行名称
+	BANKACCOUNTNO       string  `json:"bankaccountno"  xorm:"BANKACCOUNTNO"`             // 银行卡号
+	BANKACCOUNTNAME     string  `json:"bankaccountname"  xorm:"BANKACCOUNTNAME"`         // 银行账户名
+	EXTENDINFO          string  `json:"extendinfo"  xorm:"EXTENDINFO"`                   // 扩展信息
+	AUDITID             int64   `json:"auditid"  xorm:"AUDITID"`                         // 审核人
+	AUDITTIME           string  `json:"audittime"  xorm:"AUDITTIME"`                     // 审核时间
+	REMARK              string  `json:"remark"  xorm:"REMARK"`                           // 备注
+	NETADDR             string  `json:"netaddr"  xorm:"NETADDR"`                         // 调转网址
+	ACCOUNTTICKET       string  `json:"accountticket"  xorm:"ACCOUNTTICKET"`             // 最新账户服务流水号
+	CHECKERRORFLAG      int32   `json:"checkerrorflag"  xorm:"CHECKERRORFLAG"`           // 对账差错标志 - 1:为单边账;其它为正常出入金
+	REMARK2             string  `json:"remark2"  xorm:"REMARK2"`                         // 备注(失败原因)
+	REAUDITID           int64   `json:"reauditid"  xorm:"REAUDITID"`                     // 复审人
+	REAUDITTIME         string  `json:"reaudittime"  xorm:"REAUDITTIME"`                 // 复审时间
+	REAUDITREMARK       string  `json:"reauditremark"  xorm:"REAUDITREMARK"`             // 复审备注
+	APPLYREMARK         string  `json:"applyremark"  xorm:"APPLYREMARK"`                 // 申请备注
+	RELATEDORDERID      string  `json:"relatedorderid"  xorm:"RELATEDORDERID"`           // 三方关联ID
+	CAPAMOUNTOUT        float64 `json:"capamountout"  xorm:"CAPAMOUNTOUT"`               // 出金(劣后本金) - 外部子账户
+	INFAMOUNT           float64 `json:"infamount"  xorm:"INFAMOUNT"`                     // 劣后金额(自有)
+	PRIAMOUNT           float64 `json:"priamount"  xorm:"PRIAMOUNT"`                     // 优先金额(授信)
+	BANK_APPLY_TICKET   string  `json:"bank_apply_ticket"  xorm:"BANK_APPLY_TICKET"`     // 银行申请流水
+	CERTIFICATEPHOTOURL string  `json:"certificatephotourl"  xorm:"CERTIFICATEPHOTOURL"` // 凭证地址
+	SOUCREAMOUNT        float64 `json:"soucreamount"  xorm:"SOUCREAMOUNT"`               // 原始出入金金额
+	SOUCRECURRENCYID    int64   `json:"soucrecurrencyid"  xorm:"SOUCRECURRENCYID"`       // 原始出入金币种
+	ACCOUNTCODE         string  `json:"accountcode"  xorm:"ACCOUNTCODE"`                 // 资金账号
+	CUSBANKID           string  `json:"cusbankid"  xorm:"CUSBANKID"`                     // 托管银行编号
+	TRADEDATE           string  `json:"tradedate"  xorm:"TRADEDATE"`                     // 交易日(yyyyMMdd)
+	EXCHTICKET          string  `json:"exchticket"  xorm:"EXCHTICKET"`                   // 银行服务流水号
+	EXTOPERATEID        int64   `json:"extoperateid"  xorm:"EXTOPERATEID"`               // 交易服务流水号
+	BANKTICKET          string  `json:"bankticket"  xorm:"BANKTICKET"`                   // 银行流水
+	APPLYSTATUS         int32   `json:"applystatus"  xorm:"APPLYSTATUS"`                 // 申请状态 - 1:待审核 2:待复审 3:初审拒绝 4:交易冻结中 5:交易解冻中 6:交易解冻扣款中 7:交易入金中 8:交易冻结/解冻/扣款中(银行发起出金时用) 9:银行出金中 10:银行入金中 11:成功 12:失败 13:银行审核中  14:账户服务入金失败； 15:账户服务解冻失败； 16:账户服务解冻扣款失败； 17:账户服务出金失败 18:复审通过 19:复审拒绝 20:提交审核，账户冻结中 21:审核拒绝，账户解冻中；22: 待审核，账户服务解冻回滚中； 23：待复审，账户服务解冻回滚中； 24： 审核通过，账户冻结金额检查中；25： 复审通过，账户冻结金额检查中；
+	USERID              int64   `json:"userid"  xorm:"'USERID'"`                         // 用户id
+	LOGINCODE           string  `json:"logincode"  xorm:"'LOGINCODE'"`                   // 登录账号(账号)
+	USERINFOTYPE        int32   `json:"userinfotype"  xorm:"'USERINFOTYPE'"`             // 账户类型 1-个人 2-企业
+	ACCOUNTNAME         string  `json:"accountname"  xorm:"'ACCOUNTNAME'"`               // 用户名称(名称)
+
+	BeginDate  string `json:"-"` // 开始日期(yyyymmdd)
+	EndDate    string `json:"-"` // 结束日期(yyyymmdd)
+	FilterName string `json:"-"` // 账户(模糊匹配)
+}
+
+func (r *QhjAccountOutInApply) calc() {
+
+}
+
+func (r *QhjAccountOutInApply) buildSql() string {
+	var sqlId utils.SQLVal = "with tmp as(select t.userid, wm_concat(t.logincode) logincode from loginaccount t group by t.userid)" +
+		"SELECT t.EXECUTETYPE," +
+		"       t.AMOUNT," +
+		"       t.CURRENCY," +
+		"       t.CHARGE," +
+		"       t.ACCOUNTPWD," +
+		"       to_char(t.UPDATETIME, 'yyyy-mm-dd hh24:mi:ss') UPDATETIME," +
+		"       t.BANKID," +
+		"       t.BRANCHBANKID," +
+		"       t.BRANCHBANKNAME," +
+		"       t.BANKACCOUNTNO," +
+		"       t.BANKACCOUNTNAME," +
+		"       t.EXTENDINFO," +
+		"       t.AUDITID," +
+		"       to_char(t.AUDITTIME, 'yyyy-mm-dd hh24:mi:ss') AUDITTIME," +
+		"       t.REMARK," +
+		"       t.NETADDR," +
+		"       t.ACCOUNTTICKET," +
+		"       t.CHECKERRORFLAG," +
+		"       t.REMARK2," +
+		"       t.REAUDITID," +
+		"       to_char(t.REAUDITTIME, 'yyyy-mm-dd hh24:mi:ss') REAUDITTIME," +
+		"       t.REAUDITREMARK," +
+		"       t.APPLYREMARK," +
+		"       t.RELATEDORDERID," +
+		"       t.CAPAMOUNTOUT," +
+		"       t.INFAMOUNT," +
+		"       t.PRIAMOUNT," +
+		"       t.BANK_APPLY_TICKET," +
+		"       to_char(t.CERTIFICATEPHOTOURL) CERTIFICATEPHOTOURL," +
+		"       t.SOUCREAMOUNT," +
+		"       t.SOUCRECURRENCYID," +
+		"       t.ACCOUNTCODE," +
+		"       t.CUSBANKID," +
+		"       t.TRADEDATE," +
+		"       t.EXCHTICKET," +
+		"       t.EXTOPERATEID," +
+		"       t.BANKTICKET," +
+		"       t.APPLYSTATUS," +
+		"       ta.userid," +
+		"       u.accountname," +
+		"       ui.userinfotype," +
+		"       tmp.logincode" +
+		"  FROM BANK_ACCOUNTOUTINAPPLY t" +
+		"  INNER JOIN TAACCOUNT ta on t.accountcode=to_char(ta.accountid)" +
+		"  INNER JOIN USERACCOUNT u on ta.relateduserid=u.userid" +
+		"  INNER JOIN USERINFO ui on u.userid=ui.userid" +
+		"  LEFT JOIN tmp on u.userid=tmp.userid" +
+		" WHERE 1 = 1"
+	if len(r.BeginDate) > 0 {
+		sqlId.Join(fmt.Sprintf(" and t.UPDATETIME >= to_date(%v,'yyyymmdd')", r.BeginDate))
+	}
+	if len(r.EndDate) > 0 {
+		sqlId.Join(fmt.Sprintf(" and t.UPDATETIME <= to_date(%v,'yyyymmdd')", r.EndDate))
+	}
+	if len(r.FilterName) > 0 {
+		sqlId.Join(fmt.Sprintf(" and (tmp.logincode like '%%%v%%' or u.accountname like '%%%v%%')", r.FilterName, r.FilterName))
+	}
+	return sqlId.String()
+}
+
+// GetDataEx 获取充值提现（出入金）
+func (r *QhjAccountOutInApply) GetDataEx() (interface{}, error) {
+	sData := make([]QhjAccountOutInApply, 0)
+	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	for i := range sData {
+		sData[i].calc()
+	}
+	return sData, err
+}

routers/router.go

@@ -463,6 +463,7 @@ func InitRouter() *gin.Engine {
 		qhjR.GET("QueryCustomerInfo", qhj.QueryCustomerInfo)
 		qhjR.GET("QueryCusBankSignBank", qhj.QueryCusBankSignBank)
 		qhjR.GET("QuerySiteColumnDetail", qhj.QuerySiteColumnDetail)
+		qhjR.GET("QueryAccountInOutApply", qhj.QueryAccountInOutApply)
 	}
 
 	return r