Browse Source

增加海商查询我的闲置收款信息接口

zhou.xiaoning 5 years ago
parent
commit
6da4628219
7 changed files with 597 additions and 56 deletions
  1. 43 50
      config/config.xml
  2. 78 2
      controllers/hsby/hsby.go
  3. 155 1
      docs/docs.go
  4. 155 1
      docs/swagger.json
  5. 109 1
      docs/swagger.yaml
  6. 54 0
      models/hsby.go
  7. 3 1
      routers/router.go

+ 43 - 50
config/config.xml

@@ -1,52 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <Configuration xmlns:http="http://www.w3.org/2001/XMLSchema-instance">
-    <WebSetting>
-        <ListenAddress value="0.0.0.0:8080"/>
-        <DebugMode value="1"/>
-    </WebSetting>
-
-    <LogSetting>
-        <LogPath value="log"/>
-        <LogLevel value="5"/>
-    </LogSetting>
-
-    <DbSetting>
-        <DbDriver  value="oci8"/>
-        <DbAddress value="192.168.31.117"/>
-        <DbName    value="orcl"/>
-        <DbPort    value="1521"/>
-        <DbUser    value="mtp2_test104"/>
-        <DbPwd     value="muchinfo"/>
-    </DbSetting>
-
-    <RedisSetting>
-        <Address   value="192.168.31.104"/>
-        <Port      value="5007"/>
-        <Timeout   value="3"/>
-        <ConnNum   value="1"/>
-        <DbNum     value="0"/>
-        <Pwd       value=""/>
-    </RedisSetting>
-
-    <MqSetting>
-        <Url       value="amqp://guest:guest@192.168.31.104:5020/test"/>
-        <Exchange  value="entry"/>
-    </MqSetting>
-
-    <MongoDBSetting>
-        <HostName   value="192.168.31.104"/>
-        <Port       value="5025"/>
-        <DBName     value="HistoryQuote"/>
-        <Username   value="quote_test01"/>
-        <Password   value="123456"/>
-    </MongoDBSetting>
-
-    <MySQLSetting>
-        <Host       value="192.168.30.113"/>
-        <Port       value="3306"/>
-        <DBName     value="historyquote_test82"/>
-        <Username   value="quote_test82"/>
-        <Password   value="123456"/>
-    </MySQLSetting>
-</Configuration>
+  <WebSetting>
+    <ListenAddress value="0.0.0.0:8280"/>
+    <DebugMode value="1"/>
+  </WebSetting>
+  <LogSetting>
+    <LogPath value="log"/>
+    <LogLevel value="5"/>
+  </LogSetting>
+  <DbSetting>
+    <DbDriver value="oci8"/>
+    <DbAddress value="192.168.21.24"/>
+    <DbName value="orcl"/>
+    <DbPort value="1521"/>
+    <DbUser value="HSBY"/>
+    <DbPwd value="muchinfo"/>
+  </DbSetting>
+  <RedisSetting>
+    <Address value="192.168.21.71"/>
+    <Port value="6379"/>
+    <Timeout value="3"/>
+    <ConnNum value="1"/>
+    <DbNum value="0"/>
+    <Pwd value=""/>
+  </RedisSetting>
+  <MqSetting>
+    <Url value="amqp://mtp:muchinfo@192.168.21.71:5672/mtp"/>
+    <Exchange value="entry"/>
+  </MqSetting>
+  <MongoDBSetting>
+    <HostName value="192.168.21.71"/>
+    <Port value="27017"/>
+    <DBName value="HistoryQuote"/>
+    <Username value="mtp"/>
+    <Password value="MuchInfo"/>
+  </MongoDBSetting>
+  <MySQLSetting>
+    <Host value="192.168.21.71"/>
+    <Port value="3306"/>
+    <DBName value="historyquote"/>
+    <Username value="mtp"/>
+    <Password value="Much@info^123"/>
+  </MySQLSetting>
+</Configuration>

+ 78 - 2
controllers/hsby/hsby.go

@@ -858,8 +858,8 @@ type QueryMyPayOrdersReq struct {
 	AccountIDs string `form:"accountIDs" binding:"required"`
 }
 
-// QueryMyPayOrders 我的订单中待付款信息查询
-// @Summary 我的订单中待付款信息查询
+// QueryMyPayOrders 获取我的订单中待付款信息
+// @Summary 获取我的订单中待付款信息
 // @Produce json
 // @Security ApiKeyAuth
 // @Param page query int false "页码"
@@ -926,6 +926,82 @@ func QueryMyPayOrders(c *gin.Context) {
 	}
 }
 
+// QueryMyCollectionOrdersReq 我的闲置中收款信息查询请求参数
+type QueryMyCollectionOrdersReq struct {
+	app.PageInfo
+	SellOrderID   int `form:"sellOrderID" binding:"required"`
+	SellAccountID int `form:"sellAccountID" binding:"required"`
+}
+
+// QueryMyCollectionOrders 我的闲置中收款信息查询
+// @Summary 我的闲置中收款信息查询
+// @Produce json
+// @Security ApiKeyAuth
+// @Param page query int false "页码"
+// @Param pagesize query int false "每页条数"
+// @Param sellOrderID query int true "卖方委托单号"
+// @Param sellAccountID query int true "卖方资金账户"
+// @Success 200 {object} models.HsbySellCollectionOrder
+// @Failure 500 {object} app.Response
+// @Router /HSBY/QueryMyCollectionOrders [get]
+// @Tags 定制【海商报业】
+func QueryMyCollectionOrders(c *gin.Context) {
+	appG := app.Gin{C: c}
+
+	// 获取请求参数
+	var req QueryMyCollectionOrdersReq
+	if err := appG.C.ShouldBindQuery(&req); err != nil {
+		logger.GetLogger().Errorf("QueryMyCollectionOrders failed: %s", err.Error())
+		appG.Response(http.StatusBadRequest, e.INVALID_PARAMS, nil)
+		return
+	}
+
+	// 获取数据
+	orders, err := models.GetHsbySellCollectionOrders(req.SellOrderID, req.SellAccountID)
+	if err != nil {
+		// 查询失败
+		logger.GetLogger().Errorf("QueryMyCollectionOrders failed: %s", err.Error())
+		appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
+		return
+	}
+
+	// 排序
+	sort.Slice(orders, func(i int, j int) bool {
+		return orders[i].Createtime.After(orders[j].Createtime)
+	})
+
+	// 分页
+	total := len(orders)
+	if req.PageSize > 0 {
+		rstByPage := make([]models.HsbySellCollectionOrder, 0)
+		// 开始上标
+		start := req.Page * req.PageSize
+		// 结束下标
+		end := start + req.PageSize
+
+		if start <= len(orders) {
+			// 判断结束下标是否越界
+			if end > len(orders) {
+				end = len(orders)
+			}
+			rstByPage = orders[start:end]
+		} else {
+			rstByPage = orders[0:0]
+		}
+
+		orders = rstByPage
+	}
+
+	// 查询成功返回
+	if req.PageSize > 0 {
+		logger.GetLogger().Debugln("QueryMyCollectionOrders successed: %v", orders)
+		appG.ResponseByPage(http.StatusOK, e.SUCCESS, orders, app.PageInfo{Page: req.Page, PageSize: req.PageSize, Total: total})
+	} else {
+		logger.GetLogger().Debugln("QueryMyCollectionOrders successed: %v", orders)
+		appG.Response(http.StatusOK, e.SUCCESS, orders)
+	}
+}
+
 // QueryHsbyMarkets 查询海商报业相关市场信息
 // @Summary 查询海商报业相关市场信息
 // @Produce json

+ 155 - 1
docs/docs.go

@@ -1918,6 +1918,64 @@ var doc = `{
                 }
             }
         },
+        "/HSBY/QueryMyCollectionOrders": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "定制【海商报业】"
+                ],
+                "summary": "我的闲置中收款信息查询",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "页码",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "每页条数",
+                        "name": "pagesize",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "卖方委托单号",
+                        "name": "sellOrderID",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "卖方资金账户",
+                        "name": "sellAccountID",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/models.HsbySellCollectionOrder"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/HSBY/QueryMyPayOrders": {
             "get": {
                 "security": [
@@ -1931,7 +1989,7 @@ var doc = `{
                 "tags": [
                     "定制【海商报业】"
                 ],
-                "summary": "我的订单中待付款信息查询",
+                "summary": "获取我的订单中待付款信息",
                 "parameters": [
                     {
                         "type": "integer",
@@ -7065,6 +7123,102 @@ var doc = `{
                 }
             }
         },
+        "models.HsbySellCollectionOrder": {
+            "type": "object",
+            "required": [
+                "tradeid"
+            ],
+            "properties": {
+                "agreeunit": {
+                    "description": "合约单位",
+                    "type": "number"
+                },
+                "buyaccountid": {
+                    "description": "买方账号ID[报价币种]",
+                    "type": "integer"
+                },
+                "buyorderid": {
+                    "description": "买方委托单号",
+                    "type": "string"
+                },
+                "createtime": {
+                    "description": "创建时间",
+                    "type": "string"
+                },
+                "currencysign": {
+                    "description": "货币符号",
+                    "type": "string"
+                },
+                "customername": {
+                    "description": "客户名称(企业名称),已脱敏",
+                    "type": "string"
+                },
+                "goodsid": {
+                    "description": "商品ID",
+                    "type": "integer"
+                },
+                "goodunit": {
+                    "description": "报价单位",
+                    "type": "string"
+                },
+                "marketid": {
+                    "description": "市场ID",
+                    "type": "integer"
+                },
+                "offamount": {
+                    "description": "优惠金额",
+                    "type": "number"
+                },
+                "payamount": {
+                    "description": "支付金额 = TradeAmount + TradeCharge - OffAmount",
+                    "type": "number"
+                },
+                "payflag": {
+                    "description": "付款标识 - 1:未支付 2:已支付 3:已过期 4:已撤销 5:结算过期 6:预售终止",
+                    "type": "integer"
+                },
+                "paylimitedtime": {
+                    "description": "支付期限",
+                    "type": "string"
+                },
+                "paytime": {
+                    "description": "付款时间",
+                    "type": "string"
+                },
+                "sellaccountid": {
+                    "description": "卖方账号ID[报价币种]",
+                    "type": "integer"
+                },
+                "sellorderid": {
+                    "description": "卖方委托单号",
+                    "type": "string"
+                },
+                "tradeamount": {
+                    "description": "成交金额",
+                    "type": "number"
+                },
+                "tradecharge": {
+                    "description": "成交手续费(买方)",
+                    "type": "number"
+                },
+                "tradedate": {
+                    "description": "交易日(yyyyMMdd)",
+                    "type": "string"
+                },
+                "tradeid": {
+                    "description": "成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
+                    "type": "string"
+                },
+                "tradeprice": {
+                    "description": "成交价格",
+                    "type": "number"
+                },
+                "tradeqty": {
+                    "description": "成交数量",
+                    "type": "integer"
+                }
+            }
+        },
         "models.HsbySellMyDetail": {
             "type": "object",
             "required": [

+ 155 - 1
docs/swagger.json

@@ -1902,6 +1902,64 @@
                 }
             }
         },
+        "/HSBY/QueryMyCollectionOrders": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "定制【海商报业】"
+                ],
+                "summary": "我的闲置中收款信息查询",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "页码",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "每页条数",
+                        "name": "pagesize",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "卖方委托单号",
+                        "name": "sellOrderID",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "卖方资金账户",
+                        "name": "sellAccountID",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/models.HsbySellCollectionOrder"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/HSBY/QueryMyPayOrders": {
             "get": {
                 "security": [
@@ -1915,7 +1973,7 @@
                 "tags": [
                     "定制【海商报业】"
                 ],
-                "summary": "我的订单中待付款信息查询",
+                "summary": "获取我的订单中待付款信息",
                 "parameters": [
                     {
                         "type": "integer",
@@ -7049,6 +7107,102 @@
                 }
             }
         },
+        "models.HsbySellCollectionOrder": {
+            "type": "object",
+            "required": [
+                "tradeid"
+            ],
+            "properties": {
+                "agreeunit": {
+                    "description": "合约单位",
+                    "type": "number"
+                },
+                "buyaccountid": {
+                    "description": "买方账号ID[报价币种]",
+                    "type": "integer"
+                },
+                "buyorderid": {
+                    "description": "买方委托单号",
+                    "type": "string"
+                },
+                "createtime": {
+                    "description": "创建时间",
+                    "type": "string"
+                },
+                "currencysign": {
+                    "description": "货币符号",
+                    "type": "string"
+                },
+                "customername": {
+                    "description": "客户名称(企业名称),已脱敏",
+                    "type": "string"
+                },
+                "goodsid": {
+                    "description": "商品ID",
+                    "type": "integer"
+                },
+                "goodunit": {
+                    "description": "报价单位",
+                    "type": "string"
+                },
+                "marketid": {
+                    "description": "市场ID",
+                    "type": "integer"
+                },
+                "offamount": {
+                    "description": "优惠金额",
+                    "type": "number"
+                },
+                "payamount": {
+                    "description": "支付金额 = TradeAmount + TradeCharge - OffAmount",
+                    "type": "number"
+                },
+                "payflag": {
+                    "description": "付款标识 - 1:未支付 2:已支付 3:已过期 4:已撤销 5:结算过期 6:预售终止",
+                    "type": "integer"
+                },
+                "paylimitedtime": {
+                    "description": "支付期限",
+                    "type": "string"
+                },
+                "paytime": {
+                    "description": "付款时间",
+                    "type": "string"
+                },
+                "sellaccountid": {
+                    "description": "卖方账号ID[报价币种]",
+                    "type": "integer"
+                },
+                "sellorderid": {
+                    "description": "卖方委托单号",
+                    "type": "string"
+                },
+                "tradeamount": {
+                    "description": "成交金额",
+                    "type": "number"
+                },
+                "tradecharge": {
+                    "description": "成交手续费(买方)",
+                    "type": "number"
+                },
+                "tradedate": {
+                    "description": "交易日(yyyyMMdd)",
+                    "type": "string"
+                },
+                "tradeid": {
+                    "description": "成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
+                    "type": "string"
+                },
+                "tradeprice": {
+                    "description": "成交价格",
+                    "type": "number"
+                },
+                "tradeqty": {
+                    "description": "成交数量",
+                    "type": "integer"
+                }
+            }
+        },
         "models.HsbySellMyDetail": {
             "type": "object",
             "required": [

+ 109 - 1
docs/swagger.yaml

@@ -2703,6 +2703,77 @@ definitions:
     - marketid
     - trademode
     type: object
+  models.HsbySellCollectionOrder:
+    properties:
+      agreeunit:
+        description: 合约单位
+        type: number
+      buyaccountid:
+        description: 买方账号ID[报价币种]
+        type: integer
+      buyorderid:
+        description: 买方委托单号
+        type: string
+      createtime:
+        description: 创建时间
+        type: string
+      currencysign:
+        description: 货币符号
+        type: string
+      customername:
+        description: 客户名称(企业名称),已脱敏
+        type: string
+      goodsid:
+        description: 商品ID
+        type: integer
+      goodunit:
+        description: 报价单位
+        type: string
+      marketid:
+        description: 市场ID
+        type: integer
+      offamount:
+        description: 优惠金额
+        type: number
+      payamount:
+        description: 支付金额 = TradeAmount + TradeCharge - OffAmount
+        type: number
+      payflag:
+        description: 付款标识 - 1:未支付 2:已支付 3:已过期 4:已撤销 5:结算过期 6:预售终止
+        type: integer
+      paylimitedtime:
+        description: 支付期限
+        type: string
+      paytime:
+        description: 付款时间
+        type: string
+      sellaccountid:
+        description: 卖方账号ID[报价币种]
+        type: integer
+      sellorderid:
+        description: 卖方委托单号
+        type: string
+      tradeamount:
+        description: 成交金额
+        type: number
+      tradecharge:
+        description: 成交手续费(买方)
+        type: number
+      tradedate:
+        description: 交易日(yyyyMMdd)
+        type: string
+      tradeid:
+        description: 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+        type: string
+      tradeprice:
+        description: 成交价格
+        type: number
+      tradeqty:
+        description: 成交数量
+        type: integer
+    required:
+    - tradeid
+    type: object
   models.HsbySellMyDetail:
     properties:
       accountid:
@@ -6127,6 +6198,43 @@ paths:
       summary: 查询热卖商品列表(二级市场挂牌点选)
       tags:
       - 定制【海商报业】
+  /HSBY/QueryMyCollectionOrders:
+    get:
+      parameters:
+      - description: 页码
+        in: query
+        name: page
+        type: integer
+      - description: 每页条数
+        in: query
+        name: pagesize
+        type: integer
+      - description: 卖方委托单号
+        in: query
+        name: sellOrderID
+        required: true
+        type: integer
+      - description: 卖方资金账户
+        in: query
+        name: sellAccountID
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/models.HsbySellCollectionOrder'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      summary: 我的闲置中收款信息查询
+      tags:
+      - 定制【海商报业】
   /HSBY/QueryMyPayOrders:
     get:
       parameters:
@@ -6156,7 +6264,7 @@ paths:
             $ref: '#/definitions/app.Response'
       security:
       - ApiKeyAuth: []
-      summary: 我的订单中待付款信息查询
+      summary: 获取我的订单中待付款信息
       tags:
       - 定制【海商报业】
   /HSBY/QueryProvincesAndCities:

+ 54 - 0
models/hsby.go

@@ -1221,3 +1221,57 @@ func GetHsbyMarketInfos() ([]HsbyMarketInfo, error) {
 
 	return markets, nil
 }
+
+// HsbySellCollectionOrder 我的闲置中收款信息
+type HsbySellCollectionOrder struct {
+	Tradeid        string    `json:"tradeid"  xorm:"'TRADEIDSTR'" binding:"required"` // 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+	Tradedate      string    `json:"tradedate"  xorm:"'TRADEDATE'"`                   // 交易日(yyyyMMdd)
+	Marketid       int32     `json:"marketid"  xorm:"'MARKETID'"`                     // 市场ID
+	Goodsid        int32     `json:"goodsid"  xorm:"'GOODSID'"`                       // 商品ID
+	Buyorderid     string    `json:"buyorderid"  xorm:"'BUYORDERIDSTR'"`              // 买方委托单号
+	Buyaccountid   int64     `json:"buyaccountid"  xorm:"'BUYACCOUNTID'"`             // 买方账号ID[报价币种]
+	Sellorderid    string    `json:"sellorderid"  xorm:"'SELLORDERIDSTR'"`            // 卖方委托单号
+	Sellaccountid  int64     `json:"sellaccountid"  xorm:"'SELLACCOUNTID'"`           // 卖方账号ID[报价币种]
+	Tradeamount    float64   `json:"tradeamount"  xorm:"'TRADEAMOUNT'"`               // 成交金额
+	Tradecharge    float64   `json:"tradecharge"  xorm:"'TRADECHARGE'"`               // 成交手续费(买方)
+	Payflag        int32     `json:"payflag"  xorm:"'PAYFLAG'"`                       // 付款标识 - 1:未支付 2:已支付 3:已过期 4:已撤销 5:结算过期 6:预售终止
+	Createtime     time.Time `json:"createtime"  xorm:"'CREATETIME'"`                 // 创建时间
+	Paytime        time.Time `json:"paytime"  xorm:"'PAYTIME'"`                       // 付款时间
+	Paylimitedtime time.Time `json:"paylimitedtime"  xorm:"'PAYLIMITEDTIME'"`         // 支付期限
+	Offamount      float64   `json:"offamount"  xorm:"'OFFAMOUNT'"`                   // 优惠金额
+	Tradeprice     float64   `json:"tradeprice"  xorm:"'TRADEPRICE'"`                 // 成交价格
+	Tradeqty       int64     `json:"tradeqty"  xorm:"'TRADEQTY'"`                     // 成交数量
+	Payamount      float64   `json:"payamount"  xorm:"'PAYAMOUNT'"`                   // 支付金额 = TradeAmount + TradeCharge - OffAmount
+
+	Customername string `json:"customername"  xorm:"'CUSTOMERNAME'"` // 客户名称(企业名称),已脱敏
+
+	Currencysign string `json:"currencysign" xorm:"CURRENCYSIGN"` // 货币符号
+	Goodunit     string `json:"goodunit"  xorm:"GOODUNIT"`        // 报价单位
+
+	Agreeunit float64 `json:"agreeunit"  xorm:"'AGREEUNIT'"` // 合约单位
+}
+
+// GetHsbySellCollectionOrders 获取我的闲置中收款信息
+func GetHsbySellCollectionOrders(sellOrderID, sellAccountID int) ([]HsbySellCollectionOrder, error) {
+	engine := db.GetEngine()
+
+	orders := make([]HsbySellCollectionOrder, 0)
+	if err := engine.Table("TRADE_PAYORDER TP").
+		Select(`to_char(TP.TRADEID) TRADEIDSTR, to_char(TP.BUYORDERID) BUYORDERIDSTR, to_char(TP.SELLORDERID) SELLORDERIDSTR, TP.*,
+				substr(U.CUSTOMERNAME,0,1)||'****' as CUSTOMERNAME,
+				E1.PARAM2 CURRENCYSIGN,
+				E1.ENUMDICNAME GOODUNIT,
+				G.AGREEUNIT`).
+		Join("LEFT", "TAACCOUNT TA", "TA.ACCOUNTID = TP.SELLACCOUNTID").
+		Join("LEFT", "USERINFO U", "U.USERID = TA.RELATEDUSERID").
+		Join("LEFT", "GOODS G", "G.GOODSID = TP.GOODSID").
+		Join("LEFT", "ENUMDICITEM E1", "E1.ENUMITEMNAME = G.CURRENCYID and E1.ENUMDICCODE = 'currency'").
+		Join("LEFT", "ENUMDICITEM E2", "E2.ENUMITEMNAME = G.GOODUNITID and E2.ENUMDICCODE = 'goodsunit'").
+		Where("TP.PAYFLAG in (1,2) and TP.SELLORDERID = ?", sellOrderID).
+		And("TP.SELLACCOUNTID = ?", sellAccountID).
+		Find(&orders); err != nil {
+		return nil, err
+	}
+
+	return orders, nil
+}

+ 3 - 1
routers/router.go

@@ -256,8 +256,10 @@ func InitRouter() *gin.Engine {
 		hsbyR.GET("/QueryHsbyBuyMyTradeDetail", hsby.QueryHsbyBuyMyTradeDetail)
 		// 获取我的订单与包裹数量
 		hsbyR.GET("/GetHsbyMyCount", hsby.GetHsbyMyCount)
-		// 获取待付款信息
+		// 获取我的订单中待付款信息
 		hsbyR.GET("/QueryMyPayOrders", hsby.QueryMyPayOrders)
+		// 获取我的闲置中收款信息查询
+		hsbyR.GET("/QueryMyCollectionOrders", hsby.QueryMyCollectionOrders)
 		// 查询海商报业相关市场信息
 		hsbyR.GET("/QueryHsbyMarkets", hsby.QueryHsbyMarkets)
 	}