From 4fbf2dc3d3506d08494252616e900eb050e1edf2 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 14 Jun 2019 13:51:09 +0800
Subject: [PATCH] =?UTF-8?q?-=20GetStoreAbnormalSkuCount=E8=A6=81=E6=8E=92?=
 =?UTF-8?q?=E9=99=A4=E4=BA=AC=E4=B8=9C=E6=B2=A1=E6=9C=89=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E8=B5=B7=E7=9A=84SKU?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go           | 9 ++++++---
 business/partner/purchase/ebai/store_sku.go | 2 +-
 business/partner/purchase/mtwm/store_sku.go | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index c783e919a..6da42ea00 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -223,7 +223,7 @@ func GetStoresSkus(ctx *jxcontext.Context, storeIDs []int, isFocus bool, keyword
 			}
 			sql += " AND ( 1 = 0"
 			if params["jdSyncStatus"] != nil && realVendorMap[model.VendorIDJD] == 1 {
-				sql += " OR (t4.jd_sync_status & ? <> 0 AND t4.jd_sync_status & ? = 0)"
+				sql += " OR (t4.jd_sync_status & ? <> 0 AND t4.jd_sync_status & ? = 0 AND t2.jd_id <> 0)"
 				sqlParams = append(sqlParams, params["jdSyncStatus"], model.SyncFlagDeletedMask|model.SyncFlagNewMask)
 			}
 			if params["ebaiSyncStatus"] != nil && realVendorMap[model.VendorIDEBAI] == 1 {
@@ -470,7 +470,11 @@ func GetStoreAbnormalSkuCount(ctx *jxcontext.Context, storeID, syncStatus int, i
 	for _, vendorID := range []int{model.VendorIDJD, model.VendorIDEBAI, model.VendorIDMTWM} {
 		if realVendorMap[vendorID] != 0 {
 			prefix := dao.ConvertDBFieldPrefix(model.VendorNames[vendorID])
-			sql += fmt.Sprintf(" OR (t1.%s_sync_status & ? <> 0 AND t1.%s_sync_status & ? = 0)", prefix, prefix)
+			sql += fmt.Sprintf(" OR (t1.%s_sync_status & ? <> 0 AND t1.%s_sync_status & ? = 0", prefix, prefix)
+			if model.MultiStoresVendorMap[vendorID] == 1 {
+				sql += fmt.Sprintf(" AND t2.%s_id <> 0", prefix)
+			}
+			sql += ")"
 			sqlParams = append(sqlParams, syncStatus, model.SyncFlagDeletedMask|model.SyncFlagNewMask)
 		}
 	}
@@ -484,7 +488,6 @@ func GetStoreAbnormalSkuCount(ctx *jxcontext.Context, storeID, syncStatus int, i
 		sql += " AND t1.status >= ? AND t1.status <= ?"
 		sqlParams = append(sqlParams, fromStatus, toStatus)
 	}
-
 	if !isBySku {
 		sql += `
 		) t1`
diff --git a/business/partner/purchase/ebai/store_sku.go b/business/partner/purchase/ebai/store_sku.go
index 94dc38715..3ecca46d3 100644
--- a/business/partner/purchase/ebai/store_sku.go
+++ b/business/partner/purchase/ebai/store_sku.go
@@ -271,7 +271,7 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
 								// globals.SugarLogger.Debug(utils.Format4Output(genSkuParamsFromStoreSkuInfo(storeSku), false))
 								// todo 适当处理重复（即已经创建）的情况
 								mergedStoreSkuStatus := jxutils.MergeSkuStatus(storeSku.SkuStatus, storeSku.Status)
-								if mergedStoreSkuStatus == model.SkuStatusNormal {
+								if mergedStoreSkuStatus == model.SkuStatusNormal { // 待创建且不可售的，暂不新建
 									if storeSku.Img != "" {
 										if globals.EnableEbaiStoreWrite {
 											storeSku.EbaiID, err = api.EbaiAPI.SkuCreate(strStoreID, storeSku.SkuID, genSkuParamsFromStoreSkuInfo(storeSku))
diff --git a/business/partner/purchase/mtwm/store_sku.go b/business/partner/purchase/mtwm/store_sku.go
index e7235b9d9..9bd27d1f8 100644
--- a/business/partner/purchase/mtwm/store_sku.go
+++ b/business/partner/purchase/mtwm/store_sku.go
@@ -292,7 +292,7 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
 				if !shouldCallSellStatus {
 					globals.SugarLogger.Debugf("mtwm SyncStoreSkus3 skuID:%d, SkuSyncStatus:%d", skuItem.SkuID, skuItem.StoreSkuSyncStatus)
 					mergeStoreSkuStatus := jxutils.MergeSkuStatus(skuItem.Status, skuItem.StoreSkuStatus)
-					if !(skuItem.StoreSkuSyncStatus&model.SyncFlagNewMask != 0 && mergeStoreSkuStatus != model.SkuStatusNormal) {
+					if !(skuItem.StoreSkuSyncStatus&model.SyncFlagNewMask != 0 && mergeStoreSkuStatus != model.SkuStatusNormal) { // 待创建且不可售的，暂不新建
 						if skuItem.Img == "" {
 							err = fmt.Errorf("SKUNAME%d:%s没有图片，同步失败", skuItem.NameID, skuItem.Name)
 						} else {