查现货订单接口增加业务类型过滤条件

controllers/ermcp3/qryErmcp3.go

@@ -564,6 +564,7 @@ func QueryPaTradeLink(c *gin.Context) {
 // @Param userid query int true "用户ID(填登录用户的userid)"
 // @Param buyorsell query int true "买卖方向 0-买 1-卖"
 // @Param goodsgroupid query int true "商品组id"
+// @Param biztype query int false "业务类型  1:套保 2:套利"
 // @Param contractno query string false "现货编号(模糊匹配)"
 // @Param customername query string false "对手方(模糊匹配)"
 // @Param wrstandardname query string false "现货商品名称(模糊匹配)"

docs/docs.go

@@ -5081,6 +5081,12 @@ var doc = `{
                         "required": true
                     },
                     {
+                        "type": "integer",
+                        "description": "业务类型  1:套保 2:套利",
+                        "name": "biztype",
+                        "in": "query"
+                    },
+                    {
                         "type": "string",
                         "description": "现货编号(模糊匹配)",
                         "name": "contractno",
@@ -22072,6 +22078,10 @@ var doc = `{
         "models.Ermcp3SCMiddleGoods": {
             "type": "object",
             "properties": {
+                "biztype": {
+                    "description": "业务类型 1:套保 2:套利",
+                    "type": "integer"
+                },
                 "contractno": {
                     "description": "合同编号",
                     "type": "string"

docs/swagger.json

@@ -5065,6 +5065,12 @@
                         "required": true
                     },
                     {
+                        "type": "integer",
+                        "description": "业务类型  1:套保 2:套利",
+                        "name": "biztype",
+                        "in": "query"
+                    },
+                    {
                         "type": "string",
                         "description": "现货编号(模糊匹配)",
                         "name": "contractno",
@@ -22056,6 +22062,10 @@
         "models.Ermcp3SCMiddleGoods": {
             "type": "object",
             "properties": {
+                "biztype": {
+                    "description": "业务类型 1:套保 2:套利",
+                    "type": "integer"
+                },
                 "contractno": {
                     "description": "合同编号",
                     "type": "string"

docs/swagger.yaml

@@ -6105,6 +6105,9 @@ definitions:
     type: object
   models.Ermcp3SCMiddleGoods:
     properties:
+      biztype:
+        description: 业务类型 1:套保 2:套利
+        type: integer
       contractno:
         description: 合同编号
         type: string
@@ -21974,6 +21977,10 @@ paths:
         name: goodsgroupid
         required: true
         type: integer
+      - description: 业务类型  1:套保 2:套利
+        in: query
+        name: biztype
+        type: integer
       - description: 现货编号(模糊匹配)
         in: query
         name: contractno

models/ermcp3.go

@@ -3045,6 +3045,7 @@ type Ermcp3SCMiddleGoods struct {
 	DELIVERYGOODSCODE     string  `json:"deliverygoodscode"  xorm:"'DELIVERYGOODSCODE'"`                 // 现货品种代码
 	DELIVERYGOODSNAME     string  `json:"deliverygoodsname"  xorm:"'DELIVERYGOODSNAME'"`                 //	现货品种名称
 	ENUMDICNAME           string  `json:"enumdicname"  xorm:"'ENUMDICNAME'"`                             // 现货单位名称
+	BIZTYPE               int     `json:"biztype"  xorm:"'BIZTYPE'" form:"biztype"`                      // 业务类型 1:套保 2:套利
 
 	BUYORSELL    int32 `json:"-" form:"buyorsell"`    // 买卖方向, 用作筛选
 	GOODSGROUPID int32 `json:"-" form:"goodsgroupid"` // 期货商品组id, 用作筛选
@@ -3070,6 +3071,7 @@ select s.userid,
        u1.accountname customername,
        s.contractno,
        s.contracttype,
+       s.biztype,
        to_char(s.spotcontractid) spotcontractid,
        w.wrstandardid,
        w.wrstandardcode,
@@ -3107,6 +3109,7 @@ select s.userid,
 		r.CONTRACTTYPE = 1
 	}
 	sqlId.And("s.CONTRACTTYPE", r.CONTRACTTYPE)
+	sqlId.AndEx("s.biztype", r.BIZTYPE, r.BIZTYPE > 0)
 	sqlId.JoinFormat(" and %v in(s.userid, s.tradeuserid, s.saleuserid, s.tradeuserid)", r.USERID)
 	sqlId.AndLike("s.contractno", r.CONTRACTNO)
 	sqlId.AndLike("u1.accountname", r.CUSTOMERNAME)