Merge branch 'master' of 192.168.30.132:MTP2.0/MTP20_IF

controllers/ermcp/qryAccMgr.go

@@ -122,15 +122,20 @@ func QueryAccMgrRoleMenu(c *gin.Context) {
 // @Produce json
 // @Security ApiKeyAuth
 // @Param userid query int true "用户ID"
+// @Param deliverygoodsid query int false "现货商品id"
 // @Success 200 {array} models.ErmcpBizGroupEx
 // @Failure 500 {object} app.Response
 // @Router /Ermcp/QueryAccMgrBizGroupSet [get]
 // @Tags 企业风险管理(app)
 func QueryAccMgrBizGroupSet(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
-	req := QryLoginUserReq{}
+	req := struct {
+		USERID          int64 `form:"userid" binding:"required"` // 用户id
+		DELIVERYGOODSID int32 `form:"deliverygoodsid"`           // 现货商品id
+	}{}
+
 	a.DoBindReq(&req)
-	m := models.ErmcpBizGroupEx{AREAUSERID: req.UserId}
+	m := models.ErmcpBizGroupEx{AREAUSERID: req.USERID, DELIVERYGOODSID: req.DELIVERYGOODSID}
 	a.DoGetDataI(&m)
 }
 

docs/docs.go

@@ -1543,6 +1543,12 @@ var doc = `{
                         "name": "userid",
                         "in": "query",
                         "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "现货商品id",
+                        "name": "deliverygoodsid",
+                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -15806,7 +15812,7 @@ var doc = `{
             "properties": {
                 "accountid": {
                     "description": "账号id",
-                    "type": "string"
+                    "type": "integer"
                 },
                 "accountname": {
                     "description": "账号名称",

docs/swagger.json

@@ -1527,6 +1527,12 @@
                         "name": "userid",
                         "in": "query",
                         "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "现货商品id",
+                        "name": "deliverygoodsid",
+                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -15790,7 +15796,7 @@
             "properties": {
                 "accountid": {
                     "description": "账号id",
-                    "type": "string"
+                    "type": "integer"
                 },
                 "accountname": {
                     "description": "账号名称",

docs/swagger.yaml

@@ -4894,7 +4894,7 @@ definitions:
     properties:
       accountid:
         description: 账号id
-        type: string
+        type: integer
       accountname:
         description: 账号名称
         type: string
@@ -13187,6 +13187,10 @@ paths:
         name: userid
         required: true
         type: integer
+      - description: 现货商品id
+        in: query
+        name: deliverygoodsid
+        type: integer
       produces:
       - application/json
       responses:

models/ermcp3.go

@@ -1595,7 +1595,7 @@ func (r *Ermcp3AreaStock) buildSql() string {
 		"  LEFT JOIN WRSTANDARD w" +
 		"    on t.wrstandardid = w.wrstandardid" +
 		"  LEFT JOIN dgfactoryitem gb" +
-		"    on t.spotgoodsbrandid = gb.dgfactoryitemvalue" +
+		"    on t.spotgoodsbrandid = gb.dgfactoryitemid" +
 		"  LEFT JOIN deliverygoods g" +
 		"    on t.deliverygoodsid = g.deliverygoodsid" +
 		"  LEFT JOIN WAREHOUSEINFO h" +
@@ -2034,7 +2034,7 @@ func (r *Ermcp3GoodsGroup) buildSql() string {
 			"            on t.goodsgroupid = g.goodsgroupid" +
 			"         where t.isvalid=1 and t.areauserid = %v)"
 		str = fmt.Sprintf(str, r.AreaUserId, r.AreaUserId)
-		sqlId.Join(fmt.Sprintf("and t.groupcategroyid not in(%v)", str))
+		sqlId.Join(fmt.Sprintf("and t.goodsgroupid in(%v)", str))
 	}
 	return sqlId.String()
 }

models/ermcpAccMgr.go

@@ -499,6 +499,7 @@ func (r *ErmcpBizGroupSpotGoods) buildSql() string {
 		"    on t.deliverygoodsid = g.deliverygoodsid" +
 		"  where 1=1"
 	sqlId.AndEx("g.areauserid", r.AREAUSERID, r.AREAUSERID > 0)
+	sqlId.AndEx("t.deliverygoodsid", r.DELIVERYGOODSID, r.DELIVERYGOODSID > 0)
 	return sqlId.String()
 }
 
@@ -515,7 +516,7 @@ func (r *ErmcpBizGroupSpotGoods) GetDataEx() ([]ErmcpBizGroupSpotGoods, error) {
 // ErcmpBizGroupTaaccount 业务分组账号
 type ErmcpBizGroupTaAccount struct {
 	BIZGROUPID  int64  `json:"bizgroupid"  xorm:"'BIZGROUPID'"`   // 业务分组id
-	ACCOUNTID   string `json:"accountid"  xorm:"'ACCOUNTID'"`     // 账号id
+	ACCOUNTID   int64  `json:"accountid"  xorm:"'ACCOUNTID'"`     // 账号id
 	AREAUSERID  int64  `json:"areauserid"  xorm:"'AREAUSERID'"`   // 所属机构id
 	ACCOUNTNAME string `json:"accountname"  xorm:"'ACCOUNTNAME'"` // 账号名称
 	ISMAIN      int32  `json:"ismain"  xorm:"'ISMAIN'"`           // 是否主账号 1-是 0-否
@@ -558,13 +559,14 @@ type ErmcpBizGroupEx struct {
 	AccList []ErmcpBizGroupTaAccount `json:"acclist"` // 账号列表
 	WrList  []ErmcpBizGroupSpotGoods `json:"wrlist"`  // 现货商品表
 
-	AREAUSERID int64 `json:"-"` // 所属机构
+	AREAUSERID      int64 `json:"-"` // 所属机构
+	DELIVERYGOODSID int32 `json:"-"` // 现货商品id
 }
 
 // GetDataEx 获取账户设置分组信息
 func (r *ErmcpBizGroupEx) GetDataEx() (interface{}, error) {
 	sData := make([]ErmcpBizGroupEx, 0)
-	mWr := ErmcpBizGroupSpotGoods{AREAUSERID: r.AREAUSERID}
+	mWr := ErmcpBizGroupSpotGoods{AREAUSERID: r.AREAUSERID, DELIVERYGOODSID: r.DELIVERYGOODSID}
 	mAcc := ErmcpBizGroupTaAccount{AREAUSERID: r.AREAUSERID}
 	if wrLst, err := mWr.GetDataEx(); err == nil {
 		for i := range wrLst {
@@ -588,6 +590,11 @@ func (r *ErmcpBizGroupEx) GetDataEx() (interface{}, error) {
 		}
 	}
 
+	if len(sData) == 0 {
+		// 如果没有业务分组, 则不用查关联资金账户了
+		return sData, nil
+	}
+
 	if accLst, err := mAcc.GetDataEx(); err == nil {
 		for i := range accLst {
 			for k := range sData {