1.修改查询 仓单贸易大厅/贸易圈 haswr 为非必填

2.新增接口 查询市场板块
3.查询合同 新增条件:是否当日

controllers/ermcp3/qryErmcp3.go

@@ -99,6 +99,8 @@ type QryContractReq struct {
 	CONTRACTID     string `form:"contractid"`     // 合同ID(SpotContractId)
 	CONTRACTNO     string `form:"contractno"`     // 现货合同编号
 	WRSTANDARDNAME string `form:"wrstandardname"` // 品类名称
+	STATUS         string `form:"status"`         // 状态
+	ISTODAY        int32  `form:"istoday"`        // 今日
 }
 
 // QuerySpotContract
@@ -112,6 +114,8 @@ type QryContractReq struct {
 // @Param contractid query string false "合同ID(SpotContractId)"
 // @Param contractno query string false "合同编号(模糊匹配)"
 // @Param wrstandardname query string false "商品名称(模糊匹配)"
+// @Param status query string false "合同状态(当填写此项时,将忽略querytype条件;可多个,逗号隔开,如0,1,2) 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回"
+// @Param istoday query int false "是否只查今日的合同  1-查今日合同"
 // @Success 200 {array} models.Ermcp3Contract
 // @Failure 500 {object} app.Response
 // @Router /Ermcp3/QuerySpotContract [get]
@@ -127,12 +131,14 @@ func QuerySpotContract(c *gin.Context) {
 		CONTRACTID     string `form:"contractid"`     // 合同ID(SpotContractId)
 		CONTRACTNO     string `form:"contractno"`     // 现货合同编号
 		WRSTANDARDNAME string `form:"wrstandardname"` // 品类名称
+		STATUS         string `form:"status"`         // 状态
+		ISTODAY        int32  `form:"istoday"`        // 今日
 	}{}
 	a.DoBindReq(&req)
 	m := models.Ermcp3Contract{USERID: mtpcache.GetAreaUserId(req.USERID, req.USERTYPE),
 		QryType: req.QUERYTYPE, CONTRACTTYPE: req.CONTRACTTYPE,
 		OwnUserId: req.USERID, UserType: req.USERTYPE, SPOTCONTRACTID: req.CONTRACTID,
-		CONTRACTNO: req.CONTRACTNO, WRSTANDARDNAME: req.WRSTANDARDNAME}
+		CONTRACTNO: req.CONTRACTNO, WRSTANDARDNAME: req.WRSTANDARDNAME, STATUS: req.STATUS, ISTODAY: req.ISTODAY}
 	a.DoGetDataI(&m)
 }
 
@@ -143,8 +149,10 @@ func QuerySpotContract(c *gin.Context) {
 // @Param userid query int true "用户id"
 // @Param usertype query int false "用户类型 2-机构 7-企业成员"
 // @Param contracttype query int true "合同类型 1-采购, -1-销售"
-// @Param querytype query int true "查询类型 1-全部 2-待点价 3-履约结算 4-已完成"
+// @Param querytype query int false "查询类型 1-全部 2-待点价 3-履约结算 4-已完成"
 // @Param contractid query string false "合同ID(SpotContractId)"
+// @Param status query string false "合同状态(当填写此项时,将忽略querytype条件;可多个,逗号隔开,如0,1,2) 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回"
+// @Param istoday query int false "是否只查今日的合同  1-查今日合同"
 // @Success 200 {array} models.Ermcp3SellBuyContract
 // @Failure 500 {object} app.Response
 // @Router /Ermcp3/QuerySpotContractBS [get]
@@ -155,7 +163,9 @@ func QuerySpotContractBS(c *gin.Context) {
 	a.DoBindReq(&req)
 	m := models.Ermcp3SellBuyContract{UserID: mtpcache.GetAreaUserId(req.USERID, req.USERTYPE),
 		Contracttype: req.CONTRACTTYPE,
-		OwnUserId:    req.USERID, UserType: req.USERTYPE, SpotContractId: req.CONTRACTID, QryType: req.QUERYTYPE}
+		OwnUserId:    req.USERID, UserType: req.USERTYPE,
+		SpotContractId: req.CONTRACTID, QryType: req.QUERYTYPE,
+		STATUS: req.STATUS, ISTODAY: req.ISTODAY}
 	a.DoGetDataI(&m)
 }
 

controllers/tjmd/qryTjmd.go

@@ -92,3 +92,18 @@ func QueryTjmdTodayAccountMargin(c *gin.Context) {
 	a.DoBindReq(&m)
 	a.DoGetDataI(&m)
 }
+
+// QueryTjmdMarketSection
+// @Summary 查询市场板块
+// @Produce json
+// @Security ApiKeyAuth
+// @Success 200 {array} models.TjmdMarketSection
+// @Failure 500 {object} app.Response
+// @Router /Tjmd/QueryTjmdMarketSection [get]
+// @Tags 天津麦顿
+func QueryTjmdMarketSection(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	m := models.TjmdMarketSection{}
+	a.DoBindReq(&m)
+	a.DoGetDataI(&m)
+}

controllers/wrTrade2/qryWrTrade.go

@@ -21,7 +21,7 @@ import (
 // @Param pagesize query int false "每页条数"
 // @Param marketid query int false "仓单贸易市场id"
 // @Param wrpricetype query int true "价格方式 - 1:固定价 2-浮动价"
-// @Param haswr query int true "0:仓单预售 1:仓单贸易"
+// @Param haswr query int false "0:仓单预售 1:仓单贸易"
 // @Param dgitemname query string false "商品要素项名称模糊匹配, 逗号隔开, 如 产地1,品牌1,规格12mm"
 // @Param warehouseid query int false "仓库id(筛选条件)"
 // @Param deliverygoodsid query int false "品种id"
@@ -34,7 +34,7 @@ import (
 // @Tags 仓单贸易v2
 func QueryOrderQuote(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
-	m := models.WrOrderQuote{}
+	m := models.WrOrderQuote{HasWr: -1}
 	a.DoBindReq(&m)
 	a.DoGetDataByPage(&m)
 }
@@ -47,7 +47,7 @@ func QueryOrderQuote(c *gin.Context) {
 // @Param pagesize query int false "每页条数"
 // @Param marketid query int false "仓单贸易市场id"
 // @Param wrpricetype query int true "价格方式 - 1:固定价 2-浮动价"
-// @Param haswr query int true "0:仓单预售 1:仓单贸易"
+// @Param haswr query int false "0:仓单预售 1:仓单贸易"
 // @Param wrfactortypeid query int true "仓单要素id"
 // @Param goodsid query int false "期货商品id(浮动价方式时填)"
 // @Param buyorsell query int true "买卖方向 0-买 1-卖"
@@ -58,7 +58,7 @@ func QueryOrderQuote(c *gin.Context) {
 // @Tags 仓单贸易v2
 func QueryOrderQuoteDetail(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
-	m := models.WrOrderQuoteDetail{}
+	m := models.WrOrderQuoteDetail{HasWr: -1}
 	a.DoBindReq(&m)
 	a.DoGetDataByPage(&m)
 }
@@ -72,7 +72,7 @@ func QueryOrderQuoteDetail(c *gin.Context) {
 // @Param pagesize query int false "每页条数"
 // @Param userid query int true "用户id"
 // @Param marketid query int false "仓单贸易市场id"
-// @Param haswr query int true "0:仓单预售 1:仓单贸易"
+// @Param haswr query int false "0:仓单预售 1:仓单贸易"
 // @Param buyorsell query int true "买卖方向 0-买 1-卖"
 // @Param deliverygoodsid query int false "品种id"
 // @Param wrstandardid query int false "品类id"
@@ -84,7 +84,7 @@ func QueryOrderQuoteDetail(c *gin.Context) {
 // @Tags 仓单贸易v2
 func QueryOrderQuoteMyq(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
-	m := models.WrQuoteOrderMyq{}
+	m := models.WrQuoteOrderMyq{HasWr: -1}
 	a.DoBindReq(&m)
 	a.DoGetDataByPage(&m)
 }

docs/docs.go

@@ -5193,6 +5193,18 @@ var doc = `{
                         "description": "商品名称(模糊匹配)",
                         "name": "wrstandardname",
                         "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "合同状态(当填写此项时,将忽略querytype条件;可多个,逗号隔开,如0,1,2) 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回",
+                        "name": "status",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "是否只查今日的合同  1-查今日合同",
+                        "name": "istoday",
+                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -5261,6 +5273,18 @@ var doc = `{
                         "description": "合同ID(SpotContractId)",
                         "name": "contractid",
                         "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "合同状态(当填写此项时,将忽略querytype条件;可多个,逗号隔开,如0,1,2) 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回",
+                        "name": "status",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "是否只查今日的合同  1-查今日合同",
+                        "name": "istoday",
+                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -11151,6 +11175,39 @@ var doc = `{
                 }
             }
         },
+        "/Tjmd/QueryTjmdMarketSection": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "天津麦顿"
+                ],
+                "summary": "查询市场板块",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.TjmdMarketSection"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Tjmd/QueryTjmdTodayAccountMargin": {
             "get": {
                 "security": [
@@ -12227,8 +12284,7 @@ var doc = `{
                         "type": "integer",
                         "description": "0:仓单预售 1:仓单贸易",
                         "name": "haswr",
-                        "in": "query",
-                        "required": true
+                        "in": "query"
                     },
                     {
                         "type": "string",
@@ -12330,8 +12386,7 @@ var doc = `{
                         "type": "integer",
                         "description": "0:仓单预售 1:仓单贸易",
                         "name": "haswr",
-                        "in": "query",
-                        "required": true
+                        "in": "query"
                     },
                     {
                         "type": "integer",
@@ -12423,8 +12478,7 @@ var doc = `{
                         "type": "integer",
                         "description": "0:仓单预售 1:仓单贸易",
                         "name": "haswr",
-                        "in": "query",
-                        "required": true
+                        "in": "query"
                     },
                     {
                         "type": "integer",
@@ -24502,7 +24556,7 @@ var doc = `{
                     "type": "boolean"
                 },
                 "menutype": {
-                    "description": "菜单类型 1:管理端 2:交易端 3:终端(企业云平台)",
+                    "description": "菜单类型 1:管理端 2:交易端 3:终端(企业云平台) 5:PCWEB(v6)",
                     "type": "integer"
                 },
                 "parentcode": {
@@ -32478,6 +32532,71 @@ var doc = `{
                 }
             }
         },
+        "models.TjmdMarketSection": {
+            "type": "object",
+            "properties": {
+                "marketsectionid": {
+                    "description": "市场版块ID(SEQ_MARKETSECTION)",
+                    "type": "integer"
+                },
+                "marketsectionname": {
+                    "description": "市场版块名称",
+                    "type": "string"
+                },
+                "mlist": {
+                    "description": "市场列表(板块下面有多少个市场)",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/models.TjmdMarketSectionConfig"
+                    }
+                },
+                "orderindex": {
+                    "description": "排序",
+                    "type": "integer"
+                },
+                "remark": {
+                    "description": "备注",
+                    "type": "string"
+                }
+            }
+        },
+        "models.TjmdMarketSectionConfig": {
+            "type": "object",
+            "properties": {
+                "auctionwrtype": {
+                    "description": "仓单类型(现货交易) 1:无仓单 2:有仓单 3;有无仓单均可",
+                    "type": "integer"
+                },
+                "listingmode": {
+                    "description": "挂牌方式 1:一口价 2:浮动价 3:贸易圈 4:协议指定",
+                    "type": "integer"
+                },
+                "marketid": {
+                    "description": "市场ID正常5位，前三位固定：两位表示交易模式， 一位表示交易属性(1:收益权，2：所有权) 其它特殊市场：0-系统 1-交割服务 2-账户服务3-履约服务 4-仓单服务 5-积分服务 6-银行服务",
+                    "type": "integer"
+                },
+                "marketname": {
+                    "description": "市场名称",
+                    "type": "string"
+                },
+                "marketsectionid": {
+                    "description": "市场版块ID(SEQ_MARKETSECTION)",
+                    "type": "integer"
+                },
+                "markettype": {
+                    "description": "市场类型 1:非交易服务 2:交易服务",
+                    "type": "integer"
+                },
+                "nowrquotaflag": {
+                    "description": "是否校验无仓单额度(仓单贸易)  0:否 1:是",
+                    "type": "integer"
+                },
+                "orderindex": {
+                    "description": "排序",
+                    "type": "integer"
+                }
+            }
+        },
         "models.TjmdQuoteGoods": {
             "type": "object",
             "properties": {

docs/swagger.json

@@ -5177,6 +5177,18 @@
                         "description": "商品名称(模糊匹配)",
                         "name": "wrstandardname",
                         "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "合同状态(当填写此项时,将忽略querytype条件;可多个,逗号隔开,如0,1,2) 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回",
+                        "name": "status",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "是否只查今日的合同  1-查今日合同",
+                        "name": "istoday",
+                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -5245,6 +5257,18 @@
                         "description": "合同ID(SpotContractId)",
                         "name": "contractid",
                         "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "合同状态(当填写此项时,将忽略querytype条件;可多个,逗号隔开,如0,1,2) 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回",
+                        "name": "status",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "是否只查今日的合同  1-查今日合同",
+                        "name": "istoday",
+                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -11135,6 +11159,39 @@
                 }
             }
         },
+        "/Tjmd/QueryTjmdMarketSection": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "天津麦顿"
+                ],
+                "summary": "查询市场板块",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.TjmdMarketSection"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Tjmd/QueryTjmdTodayAccountMargin": {
             "get": {
                 "security": [
@@ -12211,8 +12268,7 @@
                         "type": "integer",
                         "description": "0:仓单预售 1:仓单贸易",
                         "name": "haswr",
-                        "in": "query",
-                        "required": true
+                        "in": "query"
                     },
                     {
                         "type": "string",
@@ -12314,8 +12370,7 @@
                         "type": "integer",
                         "description": "0:仓单预售 1:仓单贸易",
                         "name": "haswr",
-                        "in": "query",
-                        "required": true
+                        "in": "query"
                     },
                     {
                         "type": "integer",
@@ -12407,8 +12462,7 @@
                         "type": "integer",
                         "description": "0:仓单预售 1:仓单贸易",
                         "name": "haswr",
-                        "in": "query",
-                        "required": true
+                        "in": "query"
                     },
                     {
                         "type": "integer",
@@ -24486,7 +24540,7 @@
                     "type": "boolean"
                 },
                 "menutype": {
-                    "description": "菜单类型 1:管理端 2:交易端 3:终端(企业云平台)",
+                    "description": "菜单类型 1:管理端 2:交易端 3:终端(企业云平台) 5:PCWEB(v6)",
                     "type": "integer"
                 },
                 "parentcode": {
@@ -32462,6 +32516,71 @@
                 }
             }
         },
+        "models.TjmdMarketSection": {
+            "type": "object",
+            "properties": {
+                "marketsectionid": {
+                    "description": "市场版块ID(SEQ_MARKETSECTION)",
+                    "type": "integer"
+                },
+                "marketsectionname": {
+                    "description": "市场版块名称",
+                    "type": "string"
+                },
+                "mlist": {
+                    "description": "市场列表(板块下面有多少个市场)",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/models.TjmdMarketSectionConfig"
+                    }
+                },
+                "orderindex": {
+                    "description": "排序",
+                    "type": "integer"
+                },
+                "remark": {
+                    "description": "备注",
+                    "type": "string"
+                }
+            }
+        },
+        "models.TjmdMarketSectionConfig": {
+            "type": "object",
+            "properties": {
+                "auctionwrtype": {
+                    "description": "仓单类型(现货交易) 1:无仓单 2:有仓单 3;有无仓单均可",
+                    "type": "integer"
+                },
+                "listingmode": {
+                    "description": "挂牌方式 1:一口价 2:浮动价 3:贸易圈 4:协议指定",
+                    "type": "integer"
+                },
+                "marketid": {
+                    "description": "市场ID正常5位，前三位固定：两位表示交易模式， 一位表示交易属性(1:收益权，2：所有权) 其它特殊市场：0-系统 1-交割服务 2-账户服务3-履约服务 4-仓单服务 5-积分服务 6-银行服务",
+                    "type": "integer"
+                },
+                "marketname": {
+                    "description": "市场名称",
+                    "type": "string"
+                },
+                "marketsectionid": {
+                    "description": "市场版块ID(SEQ_MARKETSECTION)",
+                    "type": "integer"
+                },
+                "markettype": {
+                    "description": "市场类型 1:非交易服务 2:交易服务",
+                    "type": "integer"
+                },
+                "nowrquotaflag": {
+                    "description": "是否校验无仓单额度(仓单贸易)  0:否 1:是",
+                    "type": "integer"
+                },
+                "orderindex": {
+                    "description": "排序",
+                    "type": "integer"
+                }
+            }
+        },
         "models.TjmdQuoteGoods": {
             "type": "object",
             "properties": {

docs/swagger.yaml

@@ -7715,7 +7715,7 @@ definitions:
         description: 是否有权限
         type: boolean
       menutype:
-        description: 菜单类型 1:管理端 2:交易端 3:终端(企业云平台)
+        description: 菜单类型 1:管理端 2:交易端 3:终端(企业云平台) 5:PCWEB(v6)
         type: integer
       parentcode:
         description: 上级资源代码
@@ -13637,6 +13637,53 @@ definitions:
     required:
     - autoid
     type: object
+  models.TjmdMarketSection:
+    properties:
+      marketsectionid:
+        description: 市场版块ID(SEQ_MARKETSECTION)
+        type: integer
+      marketsectionname:
+        description: 市场版块名称
+        type: string
+      mlist:
+        description: 市场列表(板块下面有多少个市场)
+        items:
+          $ref: '#/definitions/models.TjmdMarketSectionConfig'
+        type: array
+      orderindex:
+        description: 排序
+        type: integer
+      remark:
+        description: 备注
+        type: string
+    type: object
+  models.TjmdMarketSectionConfig:
+    properties:
+      auctionwrtype:
+        description: 仓单类型(现货交易) 1:无仓单 2:有仓单 3;有无仓单均可
+        type: integer
+      listingmode:
+        description: 挂牌方式 1:一口价 2:浮动价 3:贸易圈 4:协议指定
+        type: integer
+      marketid:
+        description: 市场ID正常5位，前三位固定：两位表示交易模式， 一位表示交易属性(1:收益权，2：所有权) 其它特殊市场：0-系统 1-交割服务 2-账户服务3-履约服务 4-仓单服务 5-积分服务 6-银行服务
+        type: integer
+      marketname:
+        description: 市场名称
+        type: string
+      marketsectionid:
+        description: 市场版块ID(SEQ_MARKETSECTION)
+        type: integer
+      markettype:
+        description: 市场类型 1:非交易服务 2:交易服务
+        type: integer
+      nowrquotaflag:
+        description: 是否校验无仓单额度(仓单贸易)  0:否 1:是
+        type: integer
+      orderindex:
+        description: 排序
+        type: integer
+    type: object
   models.TjmdQuoteGoods:
     properties:
       buyqty:
@@ -22250,6 +22297,14 @@ paths:
         in: query
         name: wrstandardname
         type: string
+      - description: 合同状态(当填写此项时,将忽略querytype条件;可多个,逗号隔开,如0,1,2) 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
+        in: query
+        name: status
+        type: string
+      - description: 是否只查今日的合同  1-查今日合同
+        in: query
+        name: istoday
+        type: integer
       produces:
       - application/json
       responses:
@@ -22294,6 +22349,14 @@ paths:
         in: query
         name: contractid
         type: string
+      - description: 合同状态(当填写此项时,将忽略querytype条件;可多个,逗号隔开,如0,1,2) 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
+        in: query
+        name: status
+        type: string
+      - description: 是否只查今日的合同  1-查今日合同
+        in: query
+        name: istoday
+        type: integer
       produces:
       - application/json
       responses:
@@ -26005,6 +26068,26 @@ paths:
       summary: 查询掉期报价列表
       tags:
       - 天津麦顿
+  /Tjmd/QueryTjmdMarketSection:
+    get:
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/models.TjmdMarketSection'
+            type: array
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      summary: 查询市场板块
+      tags:
+      - 天津麦顿
   /Tjmd/QueryTjmdTodayAccountMargin:
     get:
       parameters:
@@ -26679,7 +26762,6 @@ paths:
       - description: 0:仓单预售 1:仓单贸易
         in: query
         name: haswr
-        required: true
         type: integer
       - description: 商品要素项名称模糊匹配, 逗号隔开, 如 产地1,品牌1,规格12mm
         in: query
@@ -26746,7 +26828,6 @@ paths:
       - description: 0:仓单预售 1:仓单贸易
         in: query
         name: haswr
-        required: true
         type: integer
       - description: 仓单要素id
         in: query
@@ -26807,7 +26888,6 @@ paths:
       - description: 0:仓单预售 1:仓单贸易
         in: query
         name: haswr
-        required: true
         type: integer
       - description: 买卖方向 0-买 1-卖
         in: query

models/ermcp3.go

@@ -664,6 +664,8 @@ type Ermcp3Contract struct {
 	QryType   string `json:"-"` // 查询类型(逗号隔开,如1,2,3) 1-未提交 2-待审核 3-履约中 4-已完成
 	UserType  int32  `json:"-"` // 用户类型  2-管理员 7-企业成员
 	OwnUserId int64  `json:"-"` // 登录用户id
+	STATUS    string `json:"-"` // 状态筛选
+	ISTODAY   int32  `json:"-"` // 是否查今日
 }
 
 func (r *Ermcp3Contract) getQryTypeStatus() string {
@@ -777,7 +779,9 @@ SELECT to_char(t.SPOTCONTRACTID) SPOTCONTRACTID,
 		sqlId.AndEx("t.CONTRACTTYPE", r.CONTRACTTYPE, r.CONTRACTTYPE != 0)
 		// 用户条件
 		sqlId.Join(fmt.Sprintf(" and %v in(t.userid, t.saleuserid, t.tradeuserid, t.meruserid, l.userid)", r.OwnUserId))
-		if len(r.QryType) > 0 {
+		if len(r.STATUS) > 0 {
+			sqlId.JoinFormat(" and t.contractstatus in (%v)", r.STATUS)
+		} else if len(r.QryType) > 0 {
 			status := r.getQryTypeStatus()
 			if len(status) > 0 {
 				sqlId.Join(fmt.Sprintf(" and t.contractstatus in (%v)", status))
@@ -790,6 +794,9 @@ SELECT to_char(t.SPOTCONTRACTID) SPOTCONTRACTID,
 	if r.WRSTANDARDNAME != "" {
 		sqlId.AndLike("w.wrstandardname", r.WRSTANDARDNAME)
 	}
+	if r.ISTODAY == 1 {
+		sqlId.Join(" and trunc(t.createtime)=trunc(sysdate)")
+	}
 
 	return sqlId.String()
 }
@@ -880,9 +887,11 @@ type Ermcp3SellBuyContract struct {
 	MERUSERNAME        string `json:"merusername"`        // 跟单员名称
 
 	// 筛选条件
-	QryType   int32 `json:"-"` // 查询类型 1-未提交 2-待审核 3-履约中 4-已完成
-	UserType  int32 `json:"-"` // 用户类型  2-管理员 7-企业成员
-	OwnUserId int64 `json:"-"` // 登录用户id
+	QryType   int32  `json:"-"` // 查询类型 1-未提交 2-待审核 3-履约中 4-已完成
+	UserType  int32  `json:"-"` // 用户类型  2-管理员 7-企业成员
+	OwnUserId int64  `json:"-"` // 登录用户id
+	STATUS    string `json:"-"` // 状态筛选
+	ISTODAY   int32  `json:"-"` // 是否查今日
 }
 
 func (r *Ermcp3SellBuyContract) calc() {
@@ -1013,22 +1022,30 @@ select t.contractno,
 		sqlId.Join(fmt.Sprintf(" and %v in(t.saleuserid, t.tradeuserid, t.meruserid)", r.OwnUserId))
 	}
 
-	var status string
-	nQueryType := r.QryType
-	if 1 == nQueryType {
-		// 全部
-		status = "2,3"
-	} else if 2 == nQueryType {
-		// 待点价
-		status = "2"
-	} else {
-		// 履约
-		status = "2"
+	if len(r.STATUS) > 0 {
+		sqlId.JoinFormat(" and t.contractstatus in (%v)", r.STATUS)
+	} else if r.QryType > 0 {
+		var status string
+		nQueryType := r.QryType
+		if 1 == nQueryType {
+			// 全部
+			status = "2,3"
+		} else if 2 == nQueryType {
+			// 待点价
+			status = "2"
+		} else {
+			// 履约
+			status = "2"
+		}
+		if len(status) > 0 {
+			sqlId.Join(fmt.Sprintf(" and t.contractstatus in (%v)", status))
+		}
 	}
 
-	if len(status) > 0 {
-		sqlId.Join(fmt.Sprintf(" and t.contractstatus in (%v)", status))
+	if r.ISTODAY == 1 {
+		sqlId.Join(" and trunc(t.createtime)=trunc(sysdate)")
 	}
+
 	sqlId.JoinEx(r.QryType == 2, " and t.qty - t.pricedqty > 0 and t.pricetype !=1")
 	return sqlId.String()
 }

models/tjmd.go

@@ -264,3 +264,104 @@ func (r *TjmdTodayAccountMargin) GetDataEx() (interface{}, error) {
 	}
 	return sData, err
 }
+
+// TjmdMarketSection 市场板块
+type TjmdMarketSection struct {
+	MARKETSECTIONID   int64  `json:"marketsectionid"  xorm:"'MARKETSECTIONID'"`     // 市场版块ID(SEQ_MARKETSECTION)
+	MARKETSECTIONNAME string `json:"marketsectionname"  xorm:"'MARKETSECTIONNAME'"` // 市场版块名称
+	ORDERINDEX        int32  `json:"orderindex"  xorm:"'ORDERINDEX'"`               // 排序
+	REMARK            string `json:"remark"  xorm:"'REMARK'"`                       // 备注
+
+	MLIST []TjmdMarketSectionConfig `json:"mlist"` // 市场列表(板块下面有多少个市场)
+}
+
+func (r *TjmdMarketSection) calc() {
+	r.MLIST = make([]TjmdMarketSectionConfig, 0)
+}
+
+func (r *TjmdMarketSection) addMarketList(lst []TjmdMarketSectionConfig) {
+	for i := range lst {
+		if lst[i].MARKETSECTIONID == r.MARKETSECTIONID {
+			r.MLIST = append(r.MLIST, lst[i])
+		}
+	}
+}
+
+func (r *TjmdMarketSection) buildSql() string {
+	var sqlId utils.SQLVal = `
+SELECT t.MARKETSECTIONID, t.MARKETSECTIONNAME, t.ORDERINDEX, t.REMARK
+  FROM MARKETSECTION t
+ WHERE t.isvalid = 1
+ order by t.orderindex
+`
+	return sqlId.String()
+}
+
+// GetDataEx 获取市场板块
+func (r *TjmdMarketSection) GetDataEx() (interface{}, error) {
+	sData := make([]TjmdMarketSection, 0)
+	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	for i := range sData {
+		sData[i].calc()
+	}
+
+	// 获取版块详细配置
+	if len(sData) > 0 {
+		m := TjmdMarketSectionConfig{}
+		if d, err := m.GetDataEx(); err == nil {
+			lst := d.([]TjmdMarketSectionConfig)
+			for i := range sData {
+				sData[i].addMarketList(lst)
+			}
+		}
+	}
+
+	return sData, err
+}
+
+// TjmdMarketSectionConfig 市场板块设置
+type TjmdMarketSectionConfig struct {
+	MARKETSECTIONID int64  `json:"marketsectionid"  xorm:"'MARKETSECTIONID'"` // 市场版块ID(SEQ_MARKETSECTION)
+	MARKETID        int64  `json:"marketid"  xorm:"'MARKETID'"`               // 市场ID正常5位，前三位固定：两位表示交易模式， 一位表示交易属性(1:收益权，2：所有权) 其它特殊市场：0-系统 1-交割服务 2-账户服务3-履约服务 4-仓单服务 5-积分服务 6-银行服务
+	ORDERINDEX      int32  `json:"orderindex"  xorm:"'ORDERINDEX'"`           // 排序
+	MARKETNAME      string `json:"marketname"  xorm:"'MARKETNAME'"`           // 市场名称
+	MARKETTYPE      int32  `json:"markettype"  xorm:"'MARKETTYPE'"`           // 市场类型 1:非交易服务 2:交易服务
+	AUCTIONWRTYPE   int32  `json:"auctionwrtype"  xorm:"'AUCTIONWRTYPE'"`     // 仓单类型(现货交易) 1:无仓单 2:有仓单 3;有无仓单均可
+	NOWRQUOTAFLAG   int32  `json:"nowrquotaflag"  xorm:"'NOWRQUOTAFLAG'"`     // 是否校验无仓单额度(仓单贸易)  0:否 1:是
+	LISTINGMODE     int32  `json:"listingmode"  xorm:"'LISTINGMODE'"`         // 挂牌方式 1:一口价 2:浮动价 3:贸易圈 4:协议指定
+}
+
+func (r *TjmdMarketSectionConfig) calc() {
+
+}
+
+func (r *TjmdMarketSectionConfig) buildSql() string {
+	var sqlId utils.SQLVal = `
+select t.marketsectionid,
+       t.marketid,
+       t.orderindex,
+       m.marketname,
+       m.markettype,
+       m.auctionwrtype,
+       c.nowrquotaflag,
+       c.listingmode
+  from marketsectionconfig t
+ inner join market m
+    on t.marketid = m.marketid
+ inner join markettradeconfig c
+    on t.marketid = c.marketid
+ where 1 = 1
+ order by t.orderindex
+`
+	return sqlId.String()
+}
+
+// GetDataEx 获取市场板块设置
+func (r *TjmdMarketSectionConfig) GetDataEx() (interface{}, error) {
+	sData := make([]TjmdMarketSectionConfig, 0)
+	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	for i := range sData {
+		sData[i].calc()
+	}
+	return sData, err
+}

models/wrTrade2.go

@@ -136,7 +136,7 @@ func (r *WrOrderQuote) buildSqlFixedPrice() string {
 		"  where 1=1 %v " +
 		"order by deliverygoodsname"
 	var param, param2 utils.SQLVal
-	param.And("t.haswr", r.HasWr)
+	param.AndEx("t.haswr", r.HasWr, r.HasWr >= 0)
 	param.And("t.wrpricetype", r.WrPriceType)
 	param.AndEx("t.marketid", r.MarketId, r.MarketId > 0)
 	param.AndEx("t.wrfactortypeid", r.WRFACTORTYPEID, len(r.WRFACTORTYPEID) > 0)
@@ -244,7 +244,7 @@ func (r *WrOrderQuote) buildSqlPriceMove() string {
 		" where 1 = 1 %v" +
 		" order by deliverygoodsname"
 	var param, param2 utils.SQLVal
-	param.And("t.haswr", r.HasWr)
+	param.AndEx("t.haswr", r.HasWr, r.HasWr >= 0)
 	param.And("t.wrpricetype", r.WrPriceType)
 	param.AndEx("t.marketid", r.MarketId, r.MarketId > 0)
 	param.AndEx("t.wrfactortypeid", r.WRFACTORTYPEID, len(r.WRFACTORTYPEID) > 0)
@@ -3251,7 +3251,7 @@ select to_char(t.wrtradeorderid) wrtradeorderid,
    )
 `
 	sqlId.FormatParam(r.USERID, r.USERID, r.USERID)
-	sqlId.And("t.haswr", r.HasWr)
+	sqlId.AndEx("t.haswr", r.HasWr, r.HasWr >= 0)
 	r.WrPriceType = 1 // 查固定价
 	sqlId.And("t.wrpricetype", r.WrPriceType)
 	sqlId.AndEx("t.wrfactortypeid", r.WRFACTORTYPEID, r.WRFACTORTYPEID != "")

routers/router.go

@@ -590,6 +590,7 @@ func InitRouter() *gin.Engine {
 		tjmdR.GET("QueryTjmdTradeOrderDetail", tjmd.QueryTjmdTradeOrderDetail)
 		tjmdR.GET("QueryTjmdTransferApply", tjmd.QueryTjmdTransferApply)
 		tjmdR.GET("QueryTjmdTodayAccountMargin", tjmd.QueryTjmdTodayAccountMargin)
+		tjmdR.GET("QueryTjmdMarketSection", tjmd.QueryTjmdMarketSection)
 	}
 
 	// **************************中江*************************