From bc6a5e9400be97bec06b0326290bbd2e61cede36 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 14 Aug 2019 13:54:37 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=90=8C=E6=AD=A5=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=97=B6=EF=BC=8C=E5=A4=84=E7=90=86=E5=A4=9A?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=B9=B3=E5=8F=B0SyncFlagModifiedMask?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sync_store_sku.go | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index c07fca7c5..b0a64a0f8 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -311,28 +311,23 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo if model.IsSyncStatusUpdate(sku.StoreSkuSyncStatus) && singleStoreHandler != nil { updateList = append(updateList, calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage))) } else { - isAddedStock := false if model.IsSyncStatusPrice(sku.StoreSkuSyncStatus) { bareSku = storeSkuSyncInfo2Bare(calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage))) priceList = append(priceList, bareSku) } - // if model.IsSyncStatusUpdate(sku.StoreSkuSyncStatus) && singleStoreHandler == nil { - // if bareSku == nil { - // bareSku = storeSkuSyncInfo2Bare(sku) - // } - // stockList = append(stockList, bareSku) - // isAddedStock = true - // } + if model.IsSyncStatusUpdate(sku.StoreSkuSyncStatus) && singleStoreHandler == nil { // 正常就不应该进到这里 + if bareSku == nil { + bareSku = storeSkuSyncInfo2Bare(sku) + } + updateItems = append(updateItems, sku2Update(vendorID, sku, model.SyncFlagStockMask)) + } if model.IsSyncStatusSale(sku.StoreSkuSyncStatus) { if bareSku == nil { bareSku = storeSkuSyncInfo2Bare(sku) } if sku.MergedStatus == model.SkuStatusNormal { onlineList = append(onlineList, bareSku) - if !isAddedStock { - stockList = append(stockList, bareSku) - isAddedStock = true - } + stockList = append(stockList, bareSku) } else { offlineList = append(offlineList, bareSku) }