From 99868cd068a586e0167c88d753b14f175a56b8c3 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 4 Nov 2019 17:06:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E5=8C=85=E6=97=B6=EF=BC=8C=E6=9B=B4=E6=96=B0=E9=97=A8?=
 =?UTF-8?q?=E5=BA=97=E5=95=86=E5=93=81=E5=90=8C=E6=AD=A5=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/cms.go     | 17 ++++++++++++-----
 business/model/dao/store_sku.go |  6 +++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 61a09669b..346ca1a4f 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -348,13 +348,20 @@ func UpdateConfig(ctx *jxcontext.Context, key, configType, value string) (hint s
 			return "", err
 		}
 		dao.Commit(db)
+		vendorStoreMap := make(map[int][]int)
 		for _, v := range storeMapList {
-			if _, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, &model.StoreSkuBind{}, nil, ctx.GetUserName(), map[string]interface{}{
-				model.FieldStoreID: v.StoreID,
-			}, dao.GetSyncStatusStructField(model.VendorNames[v.VendorID]), model.SyncFlagPriceMask); err != nil {
-				return "", err
-			}
+			vendorStoreMap[v.VendorID] = append(vendorStoreMap[v.VendorID], v.StoreID)
 		}
+		for vendorID, storeIDs := range vendorStoreMap {
+			dao.SetStoreSkuSyncStatus(db, vendorID, storeIDs, nil, model.SyncFlagPriceMask)
+		}
+		// for _, v := range storeMapList {
+		// 	if _, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, &model.StoreSkuBind{}, nil, ctx.GetUserName(), map[string]interface{}{
+		// 		model.FieldStoreID: v.StoreID,
+		// 	}, dao.GetSyncStatusStructField(model.VendorNames[v.VendorID]), model.SyncFlagPriceMask); err != nil {
+		// 		return "", err
+		// 	}
+		// }
 	case model.ConfigTypeFreightPack:
 		dao.Commit(db)
 		storeMapList, err := dao.GetStoresMapList(db, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "")
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index d61410ad5..1b0b9be91 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -380,9 +380,9 @@ func SetStoreSkuSyncStatus(db *DaoDB, vendorID int, storeIDs []int, skuIDs []int
 		`
 		fmtParams = append(fmtParams, fieldPrefix)
 	}
-	sql += " WHERE (t1.deleted_at = ?)"
-	// fmtParams = append(fmtParams, fieldPrefix)
-	sqlParams = append(sqlParams, utils.DefaultTimeValue)
+	sql += " WHERE t1.deleted_at = ? AND t1.%s_sync_status & ? = 0"
+	fmtParams = append(fmtParams, fieldPrefix)
+	sqlParams = append(sqlParams, utils.DefaultTimeValue, model.SyncFlagDeletedMask)
 	if len(storeIDs) > 0 {
 		sql += " AND t1.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"
 		sqlParams = append(sqlParams, storeIDs)