Merge remote-tracking branch 'origin/mark' into su

business/jxstore/cms/store_sku.go

@@ -3027,7 +3027,7 @@ func FocusStoreSkusBySku(ctx *jxcontext.Context, skuBindInfos []*StoreSkuBindInf
 					return retVal, err
 				}
 				if len(skuList) == 0 {
-					return retVal, fmt.Errorf("未查询到此商品！商品id ：[%V]", skuID)
+					return retVal, fmt.Errorf("未查询到此商品！商品id ：[%d]", skuID)
 				}
 				focusList, _ := dao.GetStoreSkuBindByNameID(db, storeID, skuList[0].NameID, model.StoreSkuBindStatusNormal)
 				//有关注过
@@ -3086,15 +3086,15 @@ func FocusStoreSkusBySku(ctx *jxcontext.Context, skuBindInfos []*StoreSkuBindInf
 func AutoFocusStoreSkusForTopSkus(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint string, err error) {
 	db := dao.GetDB()
 	var (
-		result1   []interface{}
-		cityCodes = []int{
-			530100, //昆明
-			430300, //湘潭市
-			510700, //绵阳市
-			520100, //贵阳市
-		}
+		result1 []interface{}
+		// cityCodes = []int{
+		// 	530100, //昆明
+		// 	430300, //湘潭市
+		// 	510700, //绵阳市
+		// 	520100, //贵阳市
+		// }
 	)
-	storeList, err := dao.GetStoreList(db, nil, cityCodes, nil, nil, "")
+	storeList, err := dao.GetStoreList(db, nil, nil, nil, nil, "")
 	taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
 		switch step {
 		case 0: