- avoid mistake when use Change2JDSPU4Store

business/jxstore/initdata/initdata.go

@@ -296,7 +296,7 @@ func Convert2JDSPU(ctx *jxcontext.Context, count int, isAsync, isContinueWhenErr
 	SELECT DISTINCT t1.*
 	FROM sku_name t1
 	JOIN sku t2 ON t1.id = t2.name_id AND t2.jd_sync_status <> 0 AND t2.deleted_at = ?
-	WHERE t1.link_id <> 0;
+	WHERE t1.link_id > 0;
 	`
 	skuNameList = []*model.SkuName{}
 	if err = dao.GetRows(db, &skuNameList, sql, utils.DefaultTimeValue); err != nil {
@@ -339,7 +339,7 @@ func Change2JDSPU4Store(ctx *jxcontext.Context, storeIDs []int, step int, isAsyn
 		sql = `
 		DELETE t1
 		FROM store_sku_bind t1
-		JOIN sku t2 ON t2.id = t1.sku_id AND t2.link_id <> 0
+		JOIN sku t2 ON t2.id = t1.sku_id AND t2.link_id > 0
 		WHERE 1 = 1
 		`
 		sqlParams = []interface{}{}
@@ -372,6 +372,25 @@ func Change2JDSPU4Store(ctx *jxcontext.Context, storeIDs []int, step int, isAsyn
 			utils.DefaultTimeValue,
 		}
 	} else if step == 2 {
+		sql = `
+		SELECT COUNT(*) ct
+		FROM store_sku_bind t1
+		JOIN sku t2 ON t2.id = t1.sku_id AND t2.link_id > 0
+		WHERE 1 = 1
+		`
+		sqlParams = []interface{}{}
+		if len(storeIDs) > 0 {
+			sql += " AND store_id IN (" + dao.GenQuestionMarks(len(storeIDs)) + ")"
+			sqlParams = append(sqlParams, storeIDs)
+		}
+		ct := 0
+		if err = dao.GetRow(db, &ct, sql, sqlParams...); err != nil {
+			return "", err
+		}
+		if ct == 0 {
+			return "", fmt.Errorf("%s看起来还没有执行《将转化的SPU在门店上架》", utils.Format4Output(storeIDs, true))
+		}
+
 		sql = `
 		UPDATE store_sku_bind t1
 		JOIN sku t2 ON t2.link_id = t1.sku_id