Roc 1 سال پیش
والد
کامیت
d763faa5f0
1فایلهای تغییر یافته به همراه8 افزوده شده و 7 حذف شده
  1. 8 7
      services/data/trade_analysis/trade_analysis.go

+ 8 - 7
services/data/trade_analysis/trade_analysis.go

@@ -228,10 +228,10 @@ func getZhengzhouClassifyName(code string) (name string) {
 func GetPositionTopDetail(req trade_analysis.GetPositionTopReq) (ret trade_analysis.GetPositionTopResp, err error, errMsg string) {
 	//定义交易所
 	exchanges := map[string]string{
-		"郑商所":  "zhengzhou",
-		"大商所":  "dalian",
-		"上期所":  "shanghai",
-		"中金所":  "cffex",
+		"郑商所":   "zhengzhou",
+		"大商所":   "dalian",
+		"上期所":   "shanghai",
+		"中金所":   "cffex",
 		"上期能源": "ine",
 	}
 	exchange, ok := exchanges[req.Exchange]
@@ -262,6 +262,10 @@ func GetPositionTopDetail(req trade_analysis.GetPositionTopReq) (ret trade_analy
 			return
 		}
 	}
+	dataTimeStr = dataTime.Format(utils.FormatDate)
+	
+	ret.DataTime = dataTimeStr
+	ret.LastDataTime = lastDataTime.Format(utils.FormatDate)
 
 	//遇到周末则跳过当天
 	weekStr := dataTime.Weekday().String()
@@ -270,7 +274,6 @@ func GetPositionTopDetail(req trade_analysis.GetPositionTopReq) (ret trade_analy
 		err = fmt.Errorf(errMsg)*/
 		return
 	}
-	dataTimeStr = dataTime.Format(utils.FormatDate)
 	classifyName := req.ClassifyName
 	classifyType := req.ClassifyType
 	if exchange == "zhengzhou" {
@@ -375,7 +378,5 @@ func GetPositionTopDetail(req trade_analysis.GetPositionTopReq) (ret trade_analy
 	ret.CleanSoldList.TotalDealChange = totalChangeMap[4]
 	ret.CleanSoldList.List = detailList[4]
 
-	ret.DataTime = dataTimeStr
-	ret.LastDataTime = lastDataTime.Format(utils.FormatDate)
 	return
 }