Explorar o código

修改行情历史数据接口BUG

muchinfo hai 3 meses
pai
achega
abc8549892
Modificáronse 4 ficheiros con 11 adicións e 9 borrados
  1. 4 4
      controllers/ermcp/qryOrder.go
  2. 4 3
      controllers/quote/history.go
  3. 2 2
      models/hsby.go
  4. 1 0
      models/quote.go

+ 4 - 4
controllers/ermcp/qryOrder.go

@@ -142,7 +142,7 @@ func QueryErmcpTradePosition(c *gin.Context) {
 				}
 				item.ExExehangeName = exchange.Exchangefullname
 				// 获取对应商品盘面信息
-				quoteDays, err := models.GetQuoteDays("'" + goods.Outgoodscode + "'")
+				quoteDays, err := models.GetQuoteDays(goods.Outgoodscode)
 				if err != nil {
 					logger.GetLogger().Errorf("QueryErmcpTradePosition failed: %s", err.Error())
 					appG.Response(http.StatusBadRequest, e.ERROR_GET_QUOTE_FAILED, nil)
@@ -229,7 +229,7 @@ func QueryErmcpTradePosition(c *gin.Context) {
 				}
 				item.ExExehangeName = exchange.Exchangefullname
 				// 获取对应商品盘面信息
-				quoteDays, err := models.GetQuoteDays("'" + goods.Outgoodscode + "'")
+				quoteDays, err := models.GetQuoteDays(goods.Outgoodscode)
 				if err != nil {
 					logger.GetLogger().Errorf("QueryErmcpTradePosition failed: %s", err.Error())
 					appG.Response(http.StatusBadRequest, e.ERROR_GET_QUOTE_FAILED, nil)
@@ -340,7 +340,7 @@ func QueryErmcpTradePosition(c *gin.Context) {
 				item.ExExehangeCode = exchange.Exexchangecode
 				item.ExExehangeName = exchange.Exchangefullname
 				// 获取对应商品盘面信息
-				quoteDays, err := models.GetQuoteDays("'" + goods.Outgoodscode + "'")
+				quoteDays, err := models.GetQuoteDays(goods.Outgoodscode)
 				if err != nil {
 					logger.GetLogger().Errorf("QueryErmcpTradePosition failed: %s", err.Error())
 					appG.Response(http.StatusBadRequest, e.ERROR_GET_QUOTE_FAILED, nil)
@@ -444,7 +444,7 @@ func QueryErmcpTradePosition(c *gin.Context) {
 				}
 				item.ExExehangeName = exchange.Exchangefullname
 				// 获取对应商品盘面信息
-				quoteDays, err := models.GetQuoteDays("'" + goods.Outgoodscode + "'")
+				quoteDays, err := models.GetQuoteDays(goods.Outgoodscode)
 				if err != nil {
 					logger.GetLogger().Errorf("QueryErmcpTradePosition failed: %s", err.Error())
 					appG.Response(http.StatusBadRequest, e.ERROR_GET_QUOTE_FAILED, nil)

+ 4 - 3
controllers/quote/history.go

@@ -154,7 +154,7 @@ func QueryHistoryDatas(c *gin.Context) {
 		// 2021.06.30 业务更新:15、97和99市场的行情交易日要从商品盘面中获取
 		quoteTradeDate := ""
 		if market.TRADEMODE == 15 || market.TRADEMODE == 97 || market.TRADEMODE == 99 {
-			if quoteDays, err := models.GetQuoteDays("'" + req.GoodsCode + "'"); err == nil {
+			if quoteDays, err := models.GetQuoteDays(req.GoodsCode); err == nil {
 				if len(quoteDays) > 0 {
 					quoteTradeDate = time.Unix(quoteDays[0].Exchangedate, 0).Format("20060102")
 					logger.GetLogger().Debugf("[checkTiks] get quoteTradeDate[%v]", quoteTradeDate)
@@ -469,7 +469,7 @@ func QueryTSData(c *gin.Context) {
 	// 2021.06.30 业务更新:15、97和99市场的行情交易日要从商品盘面中获取
 	quoteTradeDate := ""
 	if market.TRADEMODE == 15 || market.TRADEMODE == 97 || market.TRADEMODE == 99 {
-		if quoteDays, err := models.GetQuoteDays("'" + req.GoodsCode + "'"); err == nil {
+		if quoteDays, err := models.GetQuoteDays(req.GoodsCode); err == nil {
 			if len(quoteDays) > 0 {
 				quoteTradeDate = time.Unix(quoteDays[0].Exchangedate, 0).Format("20060102")
 			}
@@ -529,7 +529,8 @@ func QueryTSData(c *gin.Context) {
 	}
 
 	// 获取目标商品的盘面信息
-	quoteDays, err := models.GetQuoteDays("'" + strings.ToUpper(goods.Goodscode) + "'")
+	// quoteDays, err := models.GetQuoteDays("'" + strings.ToUpper(goods.Goodscode) + "'")
+	quoteDays, err := models.GetQuoteDays(strings.ToUpper(goods.Goodscode))
 	if err != nil {
 		logger.GetLogger().Errorf("QueryTSData failed: %s", err.Error())
 		appG.Response(http.StatusBadRequest, e.ERROR_GET_GOODS_FAILED, nil)

+ 2 - 2
models/hsby.go

@@ -396,7 +396,7 @@ func GetHsbyListingGoodsDetail(goodsID, accountID int) (*HsbyListingGoodsDetail,
 	hsbyListingGoodsDetail := details[0]
 
 	// 获取商品现价和涨跌停价
-	quoteDays, err := GetQuoteDays("'" + hsbyListingGoodsDetail.Goodscode + "'")
+	quoteDays, err := GetQuoteDays(hsbyListingGoodsDetail.Goodscode)
 	if err != nil {
 		return nil, err
 	}
@@ -725,7 +725,7 @@ func GetHsbyMyGoods(accountIDs string) ([]HsbyMyGoods, error) {
 
 		// 获取商品现价和涨跌停价(挂牌点选)
 		if myGoods.Trademode == 16 {
-			quoteDays, err := GetQuoteDays("'" + myGoods.Goodscode + "'")
+			quoteDays, err := GetQuoteDays(myGoods.Goodscode)
 			if err != nil {
 				return nil, err
 			}

+ 1 - 0
models/quote.go

@@ -332,6 +332,7 @@ func GetHistoryTikDatas(goodsCode string, startTime, endTime *time.Time, count i
 // 返回 error error
 func GetQuoteDays(goodsCodes string) ([]Quoteday, error) {
 	if config.SerCfg.MySQLCfg.Enabled == 0 {
+		// 使用 Redis 盘面
 		return QueryRedisQuoteDays(goodsCodes)
 	}