From 613e364ea6990ad629326ecc253a391848c25bf0 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 23 Oct 2019 15:09:34 +0800
Subject: [PATCH] =?UTF-8?q?SyncSkus=E4=B8=AD=E5=A6=82=E6=9E=9CskuIDs?=
 =?UTF-8?q?=E6=88=96nameIDs=E4=B8=BA=E7=A9=BA=E7=9A=84=E8=AF=9D=EF=BC=8C?=
 =?UTF-8?q?=E8=A6=81=E7=AE=A1=E7=90=86=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index 19f1a94ac..22f9b97f0 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -232,7 +232,7 @@ func (v *VendorSync) SyncSku(ctx *jxcontext.Context, db *dao.DaoDB, nameID, skuI
 
 func (v *VendorSync) SyncSkus(ctx *jxcontext.Context, db *dao.DaoDB, nameIDs []int, skuIDs []int, isAsync, isContinueWhenError bool, userName string) (hint string, err error) {
 	globals.SugarLogger.Debugf("SyncSku trackInfo:%s, nameIDs:%v, skuIDs:%v, userName:%s", ctx.GetTrackInfo(), nameIDs, skuIDs, userName)
-	isManagedIt := len(nameIDs) > 1 || len(skuIDs) > 1
+	isManagedIt := len(nameIDs) > 1 || len(nameIDs) == 0 || len(skuIDs) > 1 || len(skuIDs) == 0
 	return v.LoopMultiStoresVendors(ctx, db, fmt.Sprintf("同步商品信息, nameIDs:%v, skuIDs:%v", nameIDs, skuIDs), isAsync, isManagedIt,
 		func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
 			var resultList []interface{}
@@ -248,20 +248,14 @@ func (v *VendorSync) SyncSkus(ctx *jxcontext.Context, db *dao.DaoDB, nameIDs []i
 			WHERE t1.%s_sync_status <> 0
 			`, dbField)
 			sqlParams := []interface{}{}
-			if len(nameIDs) > 1 {
+			if len(nameIDs) > 0 {
 				sql += " AND t1.name_id IN (" + dao.GenQuestionMarks(len(nameIDs)) + ")"
 				sqlParams = append(sqlParams, nameIDs)
-			} else if len(nameIDs) == 1 {
-				sql += " AND t1.name_id = ? "
-				sqlParams = append(sqlParams, nameIDs[0])
 			}
 			if len(skuIDs) > 0 {
 				sql += " AND t1.id IN(" + dao.GenQuestionMarks(len(skuIDs)) + ")"
 				sqlParams = append(sqlParams, skuIDs)
 
-			} else if len(skuIDs) == 1 {
-				sql += " AND t1.id = ? "
-				sqlParams = append(sqlParams, skuIDs[0])
 			}
 			for _, v := range skuIDs {
 				skuMap[v] = true
@@ -285,7 +279,7 @@ func (v *VendorSync) SyncSkus(ctx *jxcontext.Context, db *dao.DaoDB, nameIDs []i
 						`, dbField), skuName.ID); err == nil && len(skuList) > 0 {
 							for _, sku := range skuList {
 								syncStatus := refutil.GetObjFieldByName(sku, syncStatusFieldName).(int8)
-								globals.SugarLogger.Debugf("SyncSku trackInfo:%s, skuID:%d, syncStatus:%d", ctx.GetTrackInfo(), sku.ID, syncStatus)
+								globals.SugarLogger.Debugf("SyncSku trackInfo2:%s, skuID:%d, syncStatus:%d", ctx.GetTrackInfo(), sku.ID, syncStatus)
 								if (len(skuIDs) == 0 || skuMap[sku.ID]) && (syncStatus != 0) {
 									updateFields := []string{syncStatusFieldName}
 									if syncStatus&model.SyncFlagDeletedMask != 0 { // 删除