处理参考行情市场无节假日计划的问题

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/quote/history.go

@@ -377,6 +377,7 @@ func QueryHistoryTikDatas(c *gin.Context) {
 // QueryTSDataReq 分时图数据查询请求参数
 type QueryTSDataReq struct {
 	GoodsCode string `form:"goodsCode" binding:"required"` // 商品代码
+	MarketId  int    `form:"makretId"`                     // 关联市场ID
 }
 
 // QueryTSDataRsp 分时图数据查询返回模型
@@ -413,7 +414,8 @@ type TSDataRunStep struct {
 // @Summary  分时图数据查询
 // @Produce  json
 // @Security ApiKeyAuth
-// @Param    goodsCode query    string true "商品代码"
+// @Param    goodsCode query    string true  "商品代码"
+// @Param    makretId  query    int    false "关联市场ID"
 // @Success  200       {object} QueryTSDataRsp
 // @Failure  500       {object} app.Response
 // @Router   /Quote/QueryTSData [get]
@@ -438,12 +440,23 @@ func QueryTSData(c *gin.Context) {
 		return
 	}
 	// 获取市场
-	market, err := models.GetMarketByGoodsCode(req.GoodsCode)
-	if err != nil {
-		logger.GetLogger().Errorf("QueryTSData failed: %s", err.Error())
-		appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
-		return
+	var market *models.Market
+	if req.MarketId == 0 {
+		market, err = models.GetMarketByGoodsCode(req.GoodsCode)
+		if err != nil {
+			logger.GetLogger().Errorf("QueryTSData failed: %s", err.Error())
+			appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
+			return
+		}
+	} else {
+		market, err = models.GetMarket(req.MarketId)
+		if err != nil {
+			logger.GetLogger().Errorf("QueryTSData failed: %s", err.Error())
+			appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
+			return
+		}
 	}
+
 	if market == nil {
 		logger.GetLogger().Error("QueryTSData failed: not found goodscode")
 		appG.Response(http.StatusBadRequest, e.ERROR_GET_MARKET_FAILED, nil)

docs/docs.go

@@ -17662,6 +17662,12 @@ const docTemplate = `{
                         "name": "goodsCode",
                         "in": "query",
                         "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "关联市场ID",
+                        "name": "makretId",
+                        "in": "query"
                     }
                 ],
                 "responses": {

docs/swagger.json

@@ -17653,6 +17653,12 @@
                         "name": "goodsCode",
                         "in": "query",
                         "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "关联市场ID",
+                        "name": "makretId",
+                        "in": "query"
                     }
                 ],
                 "responses": {

docs/swagger.yaml

@@ -42079,6 +42079,10 @@ paths:
         name: goodsCode
         required: true
         type: string
+      - description: 关联市场ID
+        in: query
+        name: makretId
+        type: integer
       produces:
       - application/json
       responses: