我的持仓-转让持仓接口（/Mine/QueryMineTradePositionExs）增加服务商出参

config/config.xml

@@ -16,11 +16,11 @@
     <DbName value="orcl"/>
     <DbPort value="1521"/>
     <!-- DbUser DbPwd 支持明文密文 -->
-    <DbUser value="mtp2_test171"/>
+    <DbUser value="mtp2_test204"/>
     <DbPwd value="muchinfo"/>
   </DbSetting>
   <RedisSetting>
-    <Address value="192.168.31.171"/>
+    <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.171:5020/test"/>
+    <Url value="amqp://guest:guest@192.168.31.204:5020/test"/>
     <Exchange value="entry"/>
   </MqSetting>
   <MongoDBSetting>
-    <HostName value="192.168.31.171"/>
+    <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_test171"/>
+    <DBName value="historyquote_test204"/>
     <!-- Username Password 支持明文密文 -->
-    <Username value="quote_test171"/>
+    <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.171: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]

docs/docs.go

@@ -44470,6 +44470,14 @@ const docTemplate = `{
                     "description": "发售价(49)",
                     "type": "number"
                 },
+                "provideraccountid": {
+                    "description": "发售方资金账户ID(49)\\供货商资金账户ID(50)",
+                    "type": "integer"
+                },
+                "provideruserid": {
+                    "description": "发售方用户ID(49)\\供货商(50)",
+                    "type": "integer"
+                },
                 "quoteminunit": {
                     "description": "行情最小变动单位 [整数，报价小数位一起使用]",
                     "type": "integer"

docs/swagger.json

@@ -44461,6 +44461,14 @@
                     "description": "发售价(49)",
                     "type": "number"
                 },
+                "provideraccountid": {
+                    "description": "发售方资金账户ID(49)\\供货商资金账户ID(50)",
+                    "type": "integer"
+                },
+                "provideruserid": {
+                    "description": "发售方用户ID(49)\\供货商(50)",
+                    "type": "integer"
+                },
                 "quoteminunit": {
                     "description": "行情最小变动单位 [整数，报价小数位一起使用]",
                     "type": "integer"

docs/swagger.yaml

@@ -15527,6 +15527,12 @@ definitions:
       presaleprice:
         description: 发售价(49)
         type: number
+      provideraccountid:
+        description: 发售方资金账户ID(49)\供货商资金账户ID(50)
+        type: integer
+      provideruserid:
+        description: 发售方用户ID(49)\供货商(50)
+        type: integer
       quoteminunit:
         description: 行情最小变动单位 [整数，报价小数位一起使用]
         type: integer

models/mine.go

@@ -128,6 +128,8 @@ type MineTradePositionEx struct {
 	LASTTRADEDATE        string  `json:"lasttradedate" xorm:"LASTTRADEDATE"`               // 最后交易日期
 	QUOTEMINUNIT         int64   `json:"quoteminunit" xorm:"QUOTEMINUNIT"`                 // 行情最小变动单位 [整数，报价小数位一起使用]
 	DECIMALPLACE         int32   `json:"decimalplace" xorm:"DECIMALPLACE"`                 // 报价小数位
+	PROVIDERUSERID       int64   `json:"provideruserid" xorm:"PROVIDERUSERID"`             // 发售方用户ID(49)\供货商(50)
+	PROVIDERACCOUNTID    int64   `json:"provideraccountid" xorm:"PROVIDERACCOUNTID"`       // 发售方资金账户ID(49)\供货商资金账户ID(50)
 
 	RELATEDGOODSID int64 `json:"relatedgoodsid" xorm:"RELATEDGOODSID"` // 关联交易合约ID
 
@@ -156,6 +158,8 @@ func (r *MineTradePositionEx) buildSql() string {
 		tp.buyfrozenqty,
 		ui.customername        "SELLNAME",
 		g.presaleprice,
+		g.PROVIDERUSERID,
+		g.PROVIDERACCOUNTID,
 		to_char(g.lasttradedate, 'yyyy-mm-dd') LASTTRADEDATE,
 		tpe.accountid,
 		tpe.transferdepositratio,