..

logic/profit_chart_info.go

@@ -298,10 +298,10 @@ func GetProfitChartEdbData(baseEdbInfo *models.EdbInfo, edbInfoList []*models.Ed
 	// 特殊的商品期货合约（只有M+N的合约，没有固定日期的合约）
 	specialFutureGoodEdbInfoMap := make(map[int]map[int]*future_good.FutureGoodEdbInfo, 0)
 
-	hasChina := false // 是否包含国内的期货合约
+	isAllChina := true // 是否都是国内的期货合约
 	for _, v := range zlFutureGoodEdbInfoList {
-		if v.RegionType == "国内" {
-			hasChina = true
+		if v.RegionType != "国内" {
+			isAllChina = false
 			break
 		}
 	}
@@ -363,10 +363,6 @@ func GetProfitChartEdbData(baseEdbInfo *models.EdbInfo, edbInfoList []*models.Ed
 		}
 	}
 
-	// 需求池604，只要包含了国内合约，最大必须是12期
-	if hasChina {
-		maxN = 12
-	}
 
 	// 找出所有的N值，并进行正序排列
 	dateListMap := make(map[string][]string, 0)
@@ -684,7 +680,7 @@ func ProfitChartChartData(baseEdbInfo *models.EdbInfo, baseDataListMap map[int][
 }
 
 // getFutureGoodEdbInfoList 获取适用的指标列表
-func getProfitFutureGoodEdbInfoList(earliestDateTime time.Time, zlFutureGoodEdbInfo *future_good.FutureGoodEdbInfo, tmpFutureGoodEdbInfoList []*future_good.FutureGoodEdbInfo, monthNum int) (futureGoodEdbInfoDateMap map[string]*future_good.FutureGoodEdbInfo, newMaxN int, err error) {
+func getProfitFutureGoodEdbInfoList(earliestDateTime time.Time, zlFutureGoodEdbInfo *future_good.FutureGoodEdbInfo, tmpFutureGoodEdbInfoList []*future_good.FutureGoodEdbInfo, isAllChina bool, monthNum int) (futureGoodEdbInfoDateMap map[string]*future_good.FutureGoodEdbInfo, newMaxN int, err error) {
 	maxN := 36 //最大36期合约
 	futureGoodEdbInfoList := make([]*future_good.FutureGoodEdbInfo, 0)
 	futureGoodEdbInfoDateMap = make(map[string]*future_good.FutureGoodEdbInfo)