Merge branch 'master' of http://192.168.31.240:3000/MTP2.0_New/MTP20_IF

docs/docs.go

@@ -37251,10 +37251,42 @@ const docTemplate = `{
                     "description": "卖交收运费值",
                     "type": "number"
                 },
+                "slratiodefault": {
+                    "description": "止损默认比例",
+                    "type": "number"
+                },
+                "slratiodown": {
+                    "description": "止损比例下限",
+                    "type": "number"
+                },
+                "slratioup": {
+                    "description": "止损比例上限",
+                    "type": "number"
+                },
                 "thumurls": {
                     "description": "缩略图片(1:1)(逗号分隔)",
                     "type": "string"
                 },
+                "tpratiodefault": {
+                    "description": "止盈默认比例",
+                    "type": "number"
+                },
+                "tpratiodown": {
+                    "description": "止盈比例下限",
+                    "type": "number"
+                },
+                "tpratioup": {
+                    "description": "止盈比例上限",
+                    "type": "number"
+                },
+                "tpslflag": {
+                    "description": "是否开启止盈止损 - 0:不开启 1:开启",
+                    "type": "integer"
+                },
+                "tpslforceflag": {
+                    "description": "是否强制止盈止损 - 0:不强制 1:强制",
+                    "type": "integer"
+                },
                 "trademode": {
                     "description": "交易模式 - 10:做市 13:竞价 15:通道交易 16:挂牌点选 17:仓单贸易 18:期权 19:竞拍-降价式 20:竞拍-竞价式 21:竞拍-大宗式 22:受托竞价",
                     "type": "integer"

docs/swagger.json

@@ -37242,10 +37242,42 @@
                     "description": "卖交收运费值",
                     "type": "number"
                 },
+                "slratiodefault": {
+                    "description": "止损默认比例",
+                    "type": "number"
+                },
+                "slratiodown": {
+                    "description": "止损比例下限",
+                    "type": "number"
+                },
+                "slratioup": {
+                    "description": "止损比例上限",
+                    "type": "number"
+                },
                 "thumurls": {
                     "description": "缩略图片(1:1)(逗号分隔)",
                     "type": "string"
                 },
+                "tpratiodefault": {
+                    "description": "止盈默认比例",
+                    "type": "number"
+                },
+                "tpratiodown": {
+                    "description": "止盈比例下限",
+                    "type": "number"
+                },
+                "tpratioup": {
+                    "description": "止盈比例上限",
+                    "type": "number"
+                },
+                "tpslflag": {
+                    "description": "是否开启止盈止损 - 0:不开启 1:开启",
+                    "type": "integer"
+                },
+                "tpslforceflag": {
+                    "description": "是否强制止盈止损 - 0:不强制 1:强制",
+                    "type": "integer"
+                },
                 "trademode": {
                     "description": "交易模式 - 10:做市 13:竞价 15:通道交易 16:挂牌点选 17:仓单贸易 18:期权 19:竞拍-降价式 20:竞拍-竞价式 21:竞拍-大宗式 22:受托竞价",
                     "type": "integer"

models/ermcpGoods.go

@@ -114,6 +114,15 @@ type ErmcpGoods struct {
 	RISKCONTROLMODE      int32  `json:"riskcontrolmode" xorm:"RISKCONTROLMODE"`           // 风控方式(52、10模式) 1：按单风控 2：按账户风控
 	GOODSNAMEVI          string `json:"goodsnamevi" xorm:"GOODSNAMEVI"`                   // 期货合约名称(越南语)
 
+	TPSLFLAG       int32   `json:"tpslflag"  xorm:"TPSLFLAG"`            // 是否开启止盈止损 - 0:不开启 1:开启
+	TPSLFORCEFLAG  int32   `json:"tpslforceflag"  xorm:"TPSLFORCEFLAG"`  // 是否强制止盈止损 - 0:不强制 1:强制
+	TPRATIODOWN    float64 `json:"tpratiodown" xorm:"TPRATIODOWN"`       // 止盈比例下限
+	TPRATIOUP      float64 `json:"tpratioup" xorm:"TPRATIOUP"`           // 止盈比例上限
+	TPRATIODEFAULT float64 `json:"tpratiodefault" xorm:"TPRATIODEFAULT"` // 止盈默认比例
+	SLRATIODOWN    float64 `json:"slratiodown" xorm:"SLRATIODOWN"`       // 止损比例下限
+	SLRATIOUP      float64 `json:"slratioup" xorm:"SLRATIOUP"`           // 止损比例上限
+	SLRATIODEFAULT float64 `json:"slratiodefault" xorm:"SLRATIODEFAULT"` // 止损默认比例
+
 }
 
 // GetErmcpGoodses 企业风管专用获取商品信息的方法
@@ -173,7 +182,15 @@ func GetErmcpGoodses(userid int64, lastUpdateTime string, loginID int64) ([]Ermc
 			EX.SELLOTHERFEEALGORITHM   ,
 			EX.SELLOTHERFEEVALUE       ,
 			GG.GOODSGROUPNAME          ,
-			M.RISKCONTROLMODE
+			M.RISKCONTROLMODE		   ,
+			EX.TPSLFLAG,
+			EX.tpslforceflag,
+			EX.TPRATIODOWN,
+			EX.TPRATIOUP,
+			EX.TPRATIODEFAULT,
+			EX.SLRATIODOWN,
+			EX.SLRATIOUP,
+			EX.SLRATIODEFAULT        
 			`).
 		Join("LEFT", "MARKET M", "M.MARKETID = G.MARKETID").
 		Join("LEFT", "GOODSMARGINCONFIG GM", "GM.GOODSID = G.GOODSID AND GM.ISDEFAULT = 1").