Merge branch 'master' of https://code.fnuoos.com/EggPlanet/system_rules

utils/es/base.go

@@ -20,11 +20,11 @@ func GetLatestEffectiveIndexFromAlias(now time.Time) string {
 	var esIndexName string
 	year, week := now.ISOWeek()
 	if now.Weekday() > time.Wednesday || (now.Weekday() > time.Wednesday && now.Hour() > 14) {
-		// 当前已经过了周三下午两点 返回当周蛋蛋分
-		esIndexName = egg_system_rules.IntToStr(year) + egg_system_rules.IntToStr(week)
-	} else {
-		// 没过周三下午两点 返回上周蛋蛋分
+		// 当前已经过了周三下午两点 返回上周蛋蛋分
 		esIndexName = egg_system_rules.IntToStr(year) + egg_system_rules.IntToStr(week-1)
+	} else {
+		// 没过周三下午两点 返回上上周蛋蛋分
+		esIndexName = egg_system_rules.IntToStr(year) + egg_system_rules.IntToStr(week-2)
 	}
 	return esIndexName
 }