From e0395feb1df929cae91da7d2e56923e9ef38b94b Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Sun, 27 Oct 2019 18:40:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=BE=8E=E5=9B=A2=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=97=B6=EF=BC=8C=E8=AE=B0=E5=BD=95=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BB=A5=E8=B7=9F=E8=B8=AA=E7=BE=8E=E5=9B=A2?=
 =?UTF-8?q?=E2=80=9C=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81=E6=97=B6=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E4=B8=8D=E5=AD=98=E5=9C=A8=EF=BC=8C=E4=B8=94=E5=9B=A0?=
 =?UTF-8?q?=E4=B8=BA=E5=88=86=E7=B1=BB=E5=90=8D=E7=A7=B0=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E2=80=9D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 550e64cd0..ee3711d46 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -97,6 +97,10 @@ func SyncStorCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendor
 							}
 							if err == nil {
 								updateFields = append(updateFields, idFieldName)
+								if vendorID == model.VendorIDMTWM {
+									storeCatMap.LastOperator = utils.Time2Str(time.Now())
+									updateFields = append(updateFields, model.FieldLastOperator)
+								}
 							}
 						} else if model.IsSyncStatusUpdate(catInfo.StoreCatSyncStatus) { // 修改
 							if err = handler.UpdateStoreCategory(ctx, storeID, vendorStoreID, catInfo); err == nil {
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index bfcd21adc..c83416d25 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -164,7 +164,7 @@ func GetSkusCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level int
 
 // 单门店模式厂商适用
 // 单纯的从已经创建的store_sku_category_map中，得到相关的同步信息
-func GetStoreCategories(db *DaoDB, vendorID, storeID int, level int, isDirty bool) (cats []*SkuStoreCatInfo, err error) {
+func GetStoreCategories(db *DaoDB, vendorID, storeID int, level int, mustDirty bool) (cats []*SkuStoreCatInfo, err error) {
 	fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
 	sql := `
 	SELECT t4.*,
@@ -183,7 +183,7 @@ func GetStoreCategories(db *DaoDB, vendorID, storeID int, level int, isDirty boo
 		storeID,
 		utils.DefaultTimeValue,
 	}
-	if isDirty {
+	if mustDirty {
 		sql += " AND t5.%s_sync_status <> 0"
 		fieldPrefixParams = append(fieldPrefixParams, fieldPrefix)
 	}
@@ -204,7 +204,7 @@ func GetDirtyStoreCategories(db *DaoDB, vendorID, storeID int, level int) (cats
 // 以store_sku_bind为基础来做同步，正常情况下使用
 // !!! 此函数不要将store_sku_bind中的vendor_price取出来放到StoreSkuSyncInfo.VendorPrice中，因为之后会依赖这个VendorPrice进行重算
 // 单多门店模式厂商通用
-func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, isDirty bool) (skus []*StoreSkuSyncInfo, err error) {
+func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty bool) (skus []*StoreSkuSyncInfo, err error) {
 	if vendorID < 0 {
 		panic("vendorID<0")
 	}
@@ -275,7 +275,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, isDirty bool)
 		sql += " AND t1.store_id = ?"
 		sqlParams = append(sqlParams, storeID)
 	}
-	if isDirty {
+	if mustDirty {
 		sql += " AND (t1.%s_sync_status <> 0 OR (%s.%s_id <> 0 AND t3.id IS NULL))"
 		fmtParams = append(fmtParams, fieldPrefix, tableName, fieldPrefix)
 	} else {