增加出入参

config/config.xml

@@ -16,11 +16,11 @@
     <DbName value="orcl"/>
     <DbPort value="1521"/>
     <!-- DbUser DbPwd 支持明文密文 -->
-    <DbUser value="mtp2_test136"/>
+    <DbUser value="mtp2_test204"/>
     <DbPwd value="muchinfo"/>
   </DbSetting>
   <RedisSetting>
-    <Address value="192.168.31.136"/>
+    <Address value="192.168.31.204"/>
     <Port value="5007"/>
     <Timeout value="3"/>
     <ConnNum value="1"/>
@@ -30,11 +30,11 @@
   </RedisSetting>
   <MqSetting>
     <!-- Url 支持明文密文 -->
-    <Url value="amqp://guest:guest@192.168.31.136:5020/test"/>
+    <Url value="amqp://guest:guest@192.168.31.204:5020/test"/>
     <Exchange value="entry"/>
   </MqSetting>
   <MongoDBSetting>
-    <HostName value="192.168.31.136"/>
+    <HostName value="192.168.31.204"/>
     <Port value="5025"/>
     <DBName value="HistoryQuote"/>
     <!-- Username Password 支持明文密文 -->
@@ -44,9 +44,9 @@
   <MySQLSetting>
     <Host value="192.168.30.72"/>
     <Port value="3306"/>
-    <DBName value="historyquote_test136"/>
+    <DBName value="historyquote_test204"/>
     <!-- Username Password 支持明文密文 -->
-    <Username value="quote_test136"/>
+    <Username value="quote_test204"/>
     <Password value="123456"/>
   </MySQLSetting>
   <Tencent>
@@ -66,6 +66,6 @@
     <AppId value="896210645"/>
     <PrivateKey value="MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCqmByEbXbqqq+FYxD1+mJzqrVxG/7xNF3iZJV9q0PqOVwWPEtND8nNuB2FeAwHc5+W7dZwXheVaQqWXvV6lnWp3KaQ9S4CbeOX7zKKF0j42JMj4Adknid9X6OlULZeVoXcQsdQ2h9xpfJhwLka4aOX5p1eP6WocXMrkAVRXEA8aNAlTUHBWhrbiJpKdL4KIDs6hwh0QqLbnt8i7t02wq6qubGW0hYvdY3MQL2GfbNoIZUbYezp5eCyHm/8cFT/WTt1sGSg4hD8JbUn0GTMcrh4rrQLmcJbjStNUOyjqouASTK1A2QQxSS5p2Y7AC4yut3MIqyr7ByAX9/85HtHrdX3AgMBAAECggEAFWRBnzGCyeZhYB6OD+o30j1Dx001aNWiODNYs4t4VrSeoYMqBh3Gtm8x9HybNYwAJRLp4ulJl8i2NSjvK1IWqxgqIt87x74z3ed2tO46jknKGaOMCcfzN7t4b9BxLd83pekRyUewzbV7cVqTW5WTyAZ5EUp14Wtof7vtjsg8ndZp1C0LzJrsQ63LWJAWsfkiRwNwbjkIKTl12xwe3ctZD/PmxYVgWGog+32OiiiTuSf4O1ddp3y2kth66dSIO06VPCqgu8gLwG5epgHmy0Y1ugunpZINN2D7FCH7aaE+H+aQ4nltNIxpQV20grtQG546oDilfPCQLxeW1HUipq2wkQKBgQDyqo180/lJ4wSNFU/hNqLfs2629vU9MH9aSjG5nQpchkTgBxUhAE5RkKgQHLJHJTfPx7vkx2xkI3qddwsWzvt8lNs5NQNxh+LyXQEgy9FCfpopijy2epLpzd2WT+0Y9WK5oB7O32s2YW/6fm0ahu3EJnvBlp1M23FzuRfrV7gu5QKBgQCz98MyV0UAnP3x+Gq5/0siVGPInzYlfTfYcEI3qhlMfqPVkRqqHdGGsiQL70YJlTlZkLeh3r2UvoR956nV9lZgh37aWnaHw7FAYcA5z4FYEFdmpLK/8znaKn/fxypr9xkJtw5V1QgCeaSUCFbt0xp41LaAvwSDBfFqdOTzQMFHqwKBgEyZN4YypxsClPovwwI1K95vFkCc3baN63VFvEJ55r5kB7OrqKi9HvuyLMrBNCku/1oQEyhZJsbJSDgSTqbJeSrPFhANwuOAYEveva9rhsd1jRYVs6pqMJuqxwpeeloJgztS5saoUYBd62nnpGreMolbGG94KnkLP9mmkH1SOCpdAoGAbheD3ljKilx/cLVxvIRy1vZe8EyNGBPoxMuvhlPVFBloae5RLH3/PfHd4TsnUhdqNOM1op0axlJhxI+iMpR2NKjOrg6m8diBpwvlRrgsvM2KWe0ouAm3e0GCZkd1KQTI2UuVRmaCdtkpF7GeU/BPAlnFpy6zON+61k/Z+wDC++8CgYEA54xmJqIr19BpKkcHAxE2pzDrj6ssu2qObKLfsS27o4RevBnrhoY9kPwn8kUKpngoCTd7tM42y9fcpAdUDv+lENAcIF/kz4u+zkyRGR+SpirgAsCYzxZN3GfRNDHBaFEiTkyL6NFdPGV2GTPcd0b6JGf82Thb0JJCxB/J3hVnDIs="/>
     <NotifyUrl value="http://218.17.158.45:15105/api/Asign/HandleASignCompleted"/>
-    <OpenApiUrl value="http://192.168.31.136:5015/mtp2-onlineopen"/>
+    <OpenApiUrl value="http://192.168.31.204:5015/mtp2-onlineopen"/>
   </Asign>
 </Configuration>

controllers/guangzuan/tradeService.go

@@ -18,8 +18,8 @@ import (
 // @Security Group
 // @Param    userid   query    int    true  "用户ID"
 // @Param    executestatus query    int false "执行状态 - 1:未生效 2:进行中 3:已结束"
-// @Param    page     query    int    false "页码"
-// @Param    pagesize query    int    false "每页条数"
+// @Param    page          query    int false "页码"
+// @Param    pagesize      query    int false "每页条数"
 // @Success  200           {array}  models.GzcjjcorderM
 // @Failure  500     {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrder [get]
@@ -39,8 +39,8 @@ func QueryGZCJJCOrder(c *gin.Context) {
 // @Security Group
 // @Param    userid        query    int true  "用户ID"
 // @Param    orderid  query    string false "单据ID"
-// @Param    page          query    int false "页码"
-// @Param    pagesize      query    int false "每页条数"
+// @Param    page     query    int    false "页码"
+// @Param    pagesize query    int    false "每页条数"
 // @Success  200      {array}  models.GzcjjcorderdetailM
 // @Failure  500           {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrderDetail [get]

controllers/order/order.go

@@ -88,6 +88,7 @@ type QueryTradePositionRsp struct {
 	Mindeliverylot    int64   `json:"mindeliverylot"  xorm:"MINDELIVERYLOT"`        // 最小交收手数(50模式)
 	PROVIDERUSERID    int64   `json:"provideruserid" xorm:"PROVIDERUSERID"`         // 发售方用户ID(49)\供货商(50)
 	PROVIDERACCOUNTID int64   `json:"provideraccountid" xorm:"PROVIDERACCOUNTID"`   // 发售方资金账户ID(49)\供货商资金账户ID(50)
+	RISKCONTROLMODE   int32   `json:"riskcontrolmode" xorm:"RISKCONTROLMODE"`       // 风控方式(52模式) 1：按单风控 2：按账户风控
 
 	PKID string `json:"pkid" xorm:"-"` // 自定义主键
 }
@@ -144,6 +145,7 @@ func GetTradePosition(accIds string, tradeModes string) (rst []QueryTradePositio
 		Mindeliverylot       int64   `json:"mindeliverylot"  xorm:"MINDELIVERYLOT"`      // 最小交收手数(50模式)
 		PROVIDERUSERID       int64   `json:"provideruserid" xorm:"PROVIDERUSERID"`       // 发售方用户ID(49)\供货商(50)
 		PROVIDERACCOUNTID    int64   `json:"provideraccountid" xorm:"PROVIDERACCOUNTID"` // 发售方资金账户ID(49)\供货商资金账户ID(50)
+		RISKCONTROLMODE      int32   `json:"riskcontrolmode" xorm:"RISKCONTROLMODE"`     // 风控方式(52模式) 1：按单风控 2：按账户风控
 	}
 	datas := make([]tradePosition, 0)
 	engine := db.GetEngine()
@@ -156,7 +158,7 @@ func GetTradePosition(accIds string, tradeModes string) (rst []QueryTradePositio
 		Join("LEFT", "USERINFO UI", "UI.USERID = GOODS.PROVIDERUSERID").
 		Join("LEFT", "TAACCOUNT TA", "TA.ACCOUNTID = TRADEPOSITION.ACCOUNTID").
 		Select("TRADEPOSITION.*, GOODS.GOODSCODE, GOODS.GOODSNAME, GOODS.CURRENCYID, TA.CURRENCYID TACURRENCYID, GOODS.GOODUNITID,GOODS.QTYDECIMALPLACE, GOODS.REFGOODSID, GOODS.REFGOODSCODE, GOODS.PROVIDERUSERID, GOODS.PROVIDERACCOUNTID, " +
-			"ENUMDICITEM.ENUMDICNAME as GOODUNIT, GOODS.AGREEUNIT, GOODS.DECIMALPLACE, MARKET.MARKETID, MARKET.TRADEMODE, UI.CUSTOMERNAME as MATCHNAME, nvl(EX.MINDELIVERYLOT, 1) MINDELIVERYLOT").
+			"ENUMDICITEM.ENUMDICNAME as GOODUNIT, GOODS.AGREEUNIT, GOODS.DECIMALPLACE, MARKET.MARKETID, MARKET.TRADEMODE, MARKET.RISKCONTROLMODE, UI.CUSTOMERNAME as MATCHNAME, nvl(EX.MINDELIVERYLOT, 1) MINDELIVERYLOT").
 		Where(fmt.Sprintf(`TRADEPOSITION.ACCOUNTID in (%s)`, accIds))
 	if len(tradeModes) > 0 {
 		s = s.And(fmt.Sprintf(`MARKET.TRADEMODE in (%s)`, tradeModes))
@@ -278,6 +280,7 @@ func GetTradePosition(accIds string, tradeModes string) (rst []QueryTradePositio
 
 				tradePosition.PKID = fmt.Sprintf("%v_%v_%v", tradePosition.AccountID, tradePosition.Goodsid, tradePosition.BuyOrSell)
 				tradePosition.Mindeliverylot = v.Mindeliverylot
+				tradePosition.RISKCONTROLMODE = v.RISKCONTROLMODE
 
 				rst = append(rst, tradePosition)
 			}
@@ -324,6 +327,7 @@ func GetTradePosition(accIds string, tradeModes string) (rst []QueryTradePositio
 
 				tradePosition.PKID = fmt.Sprintf("%v_%v_%v", tradePosition.AccountID, tradePosition.Goodsid, tradePosition.BuyOrSell)
 				tradePosition.Mindeliverylot = v.Mindeliverylot
+				tradePosition.RISKCONTROLMODE = v.RISKCONTROLMODE
 
 				rst = append(rst, tradePosition)
 			}

controllers/tradexx/qryTradexx.go

@@ -7,23 +7,25 @@
 package tradexx
 
 import (
-	"github.com/gin-gonic/gin"
 	"mtp2_if/global/app"
 	"mtp2_if/models"
+
+	"github.com/gin-gonic/gin"
 )
 
 // QueryTradeHolderDetail
 // @Summary  查询持仓明细
 // @Produce  json
 // @Security ApiKeyAuth
-// @Param    userid     query    int    false "用户id"
-// @Param    accids     query    string false "资金账号, 格式 1,2,3"
-// @Param    trademodes query    string false "交易模式, 格式 1,2,3"
-// @Param    marketids  query    string false "市场id, 格式 1,2,3"
-// @Param    goodsid    query    int    false "商品id"
-// @Param    buyorsell  query    int    false "买卖方向 0-买 1-卖"
-// @Success  200        {array}  models.TradeHolderDetail
-// @Failure  500        {object} app.Response
+// @Param    userid          query    int    false "用户id"
+// @Param    accids          query    string false "资金账号, 格式 1,2,3"
+// @Param    trademodes      query    string false "交易模式, 格式 1,2,3"
+// @Param    marketids       query    string false "市场id, 格式 1,2,3"
+// @Param    goodsid         query    int    false "商品id"
+// @Param    buyorsell       query    int    false "买卖方向 0-买 1-卖"
+// @Param    riskcontrolmode query    int    false "风控方式(52模式) 1：按单风控 2：按账户风控"
+// @Success  200             {array}  models.TradeHolderDetail
+// @Failure  500             {object} app.Response
 // @Router   /Order/QueryTradeHolderDetail [get]
 // @Tags     通用单据
 func QueryTradeHolderDetail(c *gin.Context) {

docs/docs.go

@@ -15010,6 +15010,12 @@ const docTemplate = `{
                         "description": "买卖方向 0-买 1-卖",
                         "name": "buyorsell",
                         "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "风控方式(52模式) 1：按单风控 2：按账户风控",
+                        "name": "riskcontrolmode",
+                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -57107,6 +57113,10 @@ const docTemplate = `{
                     "description": "释放持仓授信金额",
                     "type": "number"
                 },
+                "riskcontrolmode": {
+                    "description": "风控方式(52模式) 1：按单风控 2：按账户风控",
+                    "type": "integer"
+                },
                 "tacurrencyid": {
                     "description": "报价货币ID - taaccount",
                     "type": "integer"
@@ -64471,6 +64481,10 @@ const docTemplate = `{
                     "description": "参考商品ID",
                     "type": "integer"
                 },
+                "riskcontrolmode": {
+                    "description": "风控方式(52模式) 1：按单风控 2：按账户风控",
+                    "type": "integer"
+                },
                 "tacurrencyid": {
                     "description": "报价货币ID - taaccount",
                     "type": "integer"

docs/swagger.json

@@ -15001,6 +15001,12 @@
                         "description": "买卖方向 0-买 1-卖",
                         "name": "buyorsell",
                         "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "风控方式(52模式) 1：按单风控 2：按账户风控",
+                        "name": "riskcontrolmode",
+                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -57098,6 +57104,10 @@
                     "description": "释放持仓授信金额",
                     "type": "number"
                 },
+                "riskcontrolmode": {
+                    "description": "风控方式(52模式) 1：按单风控 2：按账户风控",
+                    "type": "integer"
+                },
                 "tacurrencyid": {
                     "description": "报价货币ID - taaccount",
                     "type": "integer"
@@ -64462,6 +64472,10 @@
                     "description": "参考商品ID",
                     "type": "integer"
                 },
+                "riskcontrolmode": {
+                    "description": "风控方式(52模式) 1：按单风控 2：按账户风控",
+                    "type": "integer"
+                },
                 "tacurrencyid": {
                     "description": "报价货币ID - taaccount",
                     "type": "integer"

docs/swagger.yaml

@@ -24843,6 +24843,9 @@ definitions:
       releaseholdercredit:
         description: 释放持仓授信金额
         type: number
+      riskcontrolmode:
+        description: 风控方式(52模式) 1：按单风控 2：按账户风控
+        type: integer
       tacurrencyid:
         description: 报价货币ID - taaccount
         type: integer
@@ -30353,6 +30356,9 @@ definitions:
       refgoodsid:
         description: 参考商品ID
         type: integer
+      riskcontrolmode:
+        description: 风控方式(52模式) 1：按单风控 2：按账户风控
+        type: integer
       tacurrencyid:
         description: 报价货币ID - taaccount
         type: integer
@@ -41042,6 +41048,10 @@ paths:
         in: query
         name: buyorsell
         type: integer
+      - description: 风控方式(52模式) 1：按单风控 2：按账户风控
+        in: query
+        name: riskcontrolmode
+        type: integer
       produces:
       - application/json
       responses:

models/tradexx.go

@@ -213,9 +213,10 @@ type TradeHolderDetail struct {
 	TradeGoodsEx        `xorm:"extends"`
 	TradeAccountEx      `xorm:"extends"`
 
-	FtAccountIDs string `json:"-" form:"accids"`     // 资金账号,逗号隔开
-	FtTradeMode  string `json:"-" form:"trademodes"` // 交易模式筛选, 逗号隔开
-	FtMarketIDs  string `json:"-" form:"marketids"`  // 市场id, 逗号隔开
+	FtAccountIDs    string `json:"-" form:"accids"`                                               // 资金账号,逗号隔开
+	FtTradeMode     string `json:"-" form:"trademodes"`                                           // 交易模式筛选, 逗号隔开
+	FtMarketIDs     string `json:"-" form:"marketids"`                                            // 市场id, 逗号隔开
+	RISKCONTROLMODE int32  `json:"riskcontrolmode" form:"riskcontrolmode" xorm:"RISKCONTROLMODE"` // 风控方式(52模式) 1：按单风控 2：按账户风控
 }
 
 func (r *TradeHolderDetail) calc() {
@@ -243,7 +244,8 @@ with gtmp as
          e.enumdicname,
          e2.enumdicname currencyname,
          m.marketname,
-         m.trademode
+         m.trademode,
+		 m.riskcontrolmode
     from goods g
     left join enumdicitem e
       on g.goodunitid = e.enumitemname
@@ -298,6 +300,7 @@ SELECT to_char(t.TRADEID) TRADEID,
  WHERE 1 = 1 and t.HOLDERQTY > 0
 `
 
+	sqlId.AndEx("gtmp.riskcontrolmode", r.RISKCONTROLMODE, r.RISKCONTROLMODE > 0)
 	sqlId.AndEx("utmp.userid", r.USERID, r.USERID > 0)
 	sqlId.AndEx("t.goodsid", r.GOODSID, r.GOODSID > 0)
 	sqlId.AndEx("t.BUYORSELL", r.BUYORSELL, r.BUYORSELL != -1)