1.期货品种只查trademode=15

2.周期缓存初始化处理

models/ermcp3.go

@@ -2027,7 +2027,8 @@ func (r *Ermcp3GoodsGroup) buildSql() string {
 		"       t.CLOSEPRICEMODE," +
 		"       t.GROUPCATEGROYID" +
 		"  FROM GOODSGROUP t" +
-		" WHERE 1 = 1"
+		"  LEFT JOIN market m on t.marketid=m.marketid" +
+		" WHERE 1 = 1 and m.trademode=15"
 	if r.ExcludeCfg == 1 {
 		str := "select t.goodsgroupid" +
 			"  from ERMS_MiddleGoods t" +
@@ -2042,7 +2043,7 @@ func (r *Ermcp3GoodsGroup) buildSql() string {
 			"            on t.goodsgroupid = g.goodsgroupid" +
 			"         where t.isvalid=1 and t.areauserid = %v)"
 		str = fmt.Sprintf(str, r.AreaUserId, r.AreaUserId)
-		sqlId.Join(fmt.Sprintf("and t.goodsgroupid in(%v)", str))
+		sqlId.Join(fmt.Sprintf(" and t.goodsgroupid in(%v)", str))
 	}
 	return sqlId.String()
 }

mtpcache/weekdate.go

@@ -32,7 +32,7 @@ type WeekDateMgr struct {
 
 func init() {
 	go func() {
-		time.Sleep(time.Second)
+		time.Sleep(time.Second * 5)
 		vWeekMgr.load("")
 	}()
 }
@@ -61,8 +61,12 @@ func (r *WeekDateMgr) load(curDate string) {
 	}
 	r.mtx.Lock()
 	defer r.mtx.Unlock()
-	sData := []WeekDate{}
-	if err := db.GetEngine().SQL(sqlId).Find(&sData); err == nil {
+	sData := make([]WeekDate, 0)
+	e := db.GetEngine()
+	if e == nil {
+		return
+	}
+	if err := e.SQL(sqlId).Find(&sData); err == nil {
 		if r.data == nil {
 			r.data = map[string]WeekDate{}
 		}