/Qhj/QueryMemberCusBankInfos: 优化参数

.gitignore

@@ -9,3 +9,4 @@ mtp2_if.exe
 .idea
 __debug_bin*
 debug_*
+vendor

controllers/qhj/qryQhj.go

@@ -310,14 +310,34 @@ func QueryCusBankSignBank(c *gin.Context) {
 // @Produce  json
 // @Security ApiKeyAuth
 // @Param    userid query    int true "用户ID"
-// @Param    memberuserid query    int true "所属会员ID"
 // @Success  200 {array}  models.MemberCusBankInfos
 // @Failure  500 {object} app.Response
 // @Router   /Qhj/QueryMemberCusBankInfos [get]
 // @Tags     大连千海金
 func QueryMemberCusBankInfos(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
-	m := models.MemberCusBankInfos{}
+	req := struct {
+		USERID int64 `form:"userid" binding:"required"` // 用户id
+	}{}
+	a.DoBindReq(&req)
+
+	userAccount, err := models.GetUserAccount(int(req.USERID))
+	if err != nil {
+		// 查询失败
+		return
+	}
+
+	// 1:机构\子机构自用 2:经纪会员下交易商用 -- 默认为交易商
+	var memberuserid = userAccount.Memberuserid
+	var configtype = 2
+
+	if userAccount.Usertype == 2 {
+		// 自营会员为1：机构\子机构自用
+		memberuserid = userAccount.Userid
+		configtype = 1
+	}
+
+	m := models.MemberCusBankInfos{MEMBERUSERID: memberuserid, CONFIGTYPE: configtype}
 	a.DoGetDataI(&m)
 }
 

docs/docs.go

@@ -16024,7 +16024,7 @@ const docTemplate = `{
                 "tags": [
                     "大连千海金"
                 ],
-                "summary": "查询机构托管银行",
+                "summary": "查询所属机构托管银行",
                 "parameters": [
                     {
                         "type": "integer",
@@ -16032,13 +16032,6 @@ const docTemplate = `{
                         "name": "userid",
                         "in": "query",
                         "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "所属会员ID",
-                        "name": "memberuserid",
-                        "in": "query",
-                        "required": true
                     }
                 ],
                 "responses": {

docs/swagger.json

@@ -16015,7 +16015,7 @@
                 "tags": [
                     "大连千海金"
                 ],
-                "summary": "查询机构托管银行",
+                "summary": "查询所属机构托管银行",
                 "parameters": [
                     {
                         "type": "integer",
@@ -16023,13 +16023,6 @@
                         "name": "userid",
                         "in": "query",
                         "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "所属会员ID",
-                        "name": "memberuserid",
-                        "in": "query",
-                        "required": true
                     }
                 ],
                 "responses": {

docs/swagger.yaml

@@ -42269,11 +42269,6 @@ paths:
         name: userid
         required: true
         type: integer
-      - description: 所属会员ID
-        in: query
-        name: memberuserid
-        required: true
-        type: integer
       produces:
       - application/json
       responses:
@@ -42289,7 +42284,7 @@ paths:
             $ref: '#/definitions/app.Response'
       security:
       - ApiKeyAuth: []
-      summary: 查询机构托管银行
+      summary: 查询所属机构托管银行
       tags:
       - 大连千海金
   /Qhj/QueryMyTeam:

models/qhj.go

@@ -1003,7 +1003,7 @@ func (r *QhjBankInfo) GetDataEx() (interface{}, error) {
 
 func (r *QhjBankInfo) buildSql2(cusbankid string) string {
 	var sqlId utils.SQLVal = "SELECT t.BANKID,t.BANKNAME,t.CLEARBANKNO,t.STATUS,t.ORDERINDEX FROM BANK_BANKINFO t WHERE 1=1" +
-		" and t.status=0 and t.bankid in (select bankid from bank_cusbanksignbank b where b.cusbankid='%v'" +
+		" and t.status=0 and t.bankid in (select bankid from bank_cusbanksignbank b where b.cusbankid='%v')" +
 		" order by t.orderindex"
 	sqlId.FormatParam(cusbankid)
 	return sqlId.String()
@@ -1404,7 +1404,7 @@ func (r *QhjCusBankInfo) GetDataEx() (interface{}, error) {
 	return r.GetData()
 }
 
-func (r *QhjCusBankInfo) buildSql2(areauserid int, configtype int) string {
+func (r *QhjCusBankInfo) buildSql2(areauserid int64, configtype int) string {
 	var sqlId utils.SQLVal = "with tmp as" +
 		" (select *" +
 		"    from (select row_number() over(partition by t.cusbankid order by t.tradedate desc) cn," +
@@ -1455,7 +1455,7 @@ func (r *QhjCusBankInfo) buildSql2(areauserid int, configtype int) string {
 }
 
 // GetAreaData 获取机构托管银行信息
-func (r *QhjCusBankInfo) GetAreaData(areauserid int, configtype int) ([]QhjCusBankInfo, error) {
+func (r *QhjCusBankInfo) GetAreaData(areauserid int64, configtype int) ([]QhjCusBankInfo, error) {
 	sData := make([]QhjCusBankInfo, 0)
 	err := db.GetEngine().SQL(r.buildSql2(areauserid, configtype)).Find(&sData)
 
@@ -1535,21 +1535,16 @@ type MemberCusBankInfos struct {
 	QhjCusBankInfo
 	Banklst []QhjBankInfo // 银行列表
 
-	userid       int `json:"-"` // 用户ID
-	memberuserid int `json:"-"` // 所属机构ID
+	MEMBERUSERID int64 `json:"-" form:"MEMBERUSERID"` // 所属机构ID
+	CONFIGTYPE   int   `json:"-" form:"CONFIGTYPE"`   // 配置类型
 }
 
 // GetDataEx 获取机构托管银行签约银行详细
 func (r *MemberCusBankInfos) GetDataEx() (interface{}, error) {
 	sData := make([]MemberCusBankInfos, 0)
-	var configtype = 2
-	if r.userid == r.memberuserid {
-		// 用户ID和所属机构ID相等则为自营会员
-		configtype = 1
-	}
 	// 获取机构渠道配置
 	b := QhjCusBankInfo{}
-	bData, _ := b.GetAreaData(r.memberuserid, configtype)
+	bData, _ := b.GetAreaData(r.MEMBERUSERID, r.CONFIGTYPE)
 	for _, vb := range bData {
 		// 托管银行
 		v := MemberCusBankInfos{QhjCusBankInfo: vb}