From e939fa5ab26e73ecf2ca6b45e8c0ded20f575764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 4 Dec 2020 16:28:17 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/sync_store_sku.go        |  7 -----
 business/partner/purchase/jdshop/store_sku.go | 28 ++++++++++---------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index f248f88ec..29af7ae9b 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -461,13 +461,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 	now := jxutils.OperationTime2HourMinuteFormat(time.Now())
 	var failedList []*partner.StoreSkuInfoWithErr
 	for _, sku := range skus {
-		if vendorID == model.VendorIDJDShop && storeID != model.JdShopMainStoreID && storeID != model.JdShopMainStoreID2 {
-			// if model.IsSyncStatusNew(sku.SkuSyncStatus) {
-			// 	sku.SkuSyncStatus = sku.SkuSyncStatus - model.SyncFlagNewMask
-			// }
-			storeDetail2, _ := dao.GetStoreDetail(db, storeID, vendorID, sku.VendorOrgCode)
-			vendorStoreID = storeDetail2.VendorStoreID
-		}
 		if !useVendorPriceDirectly &&
 			!isSkuLockTimeValid(sku) {
 			sku.VendorPrice = 0
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index b6358b8ba..2fccf7dc6 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -250,20 +250,22 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 			//如果是普通店关注商品
 			for _, v := range storeSkuList {
 				if v.VendorOrgCode == "2" {
-					storeSkus, _ := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID2}, []int{v.SkuID})
-					if len(storeSkus) > 0 {
-						for _, vv := range storeSkus {
-							if vv.JdsID != 0 {
-								status := v.Status
-								stock := v.Stock
-								price := v.VendorPrice
-								if status == model.StoreSkuBindStatusNormal {
-									api.JdShop2API.StoreWareDoUpdate(status, vv.JdsID, vendorStoreID)
+					for _, vv := range v.StoreSkuSyncInfoJds {
+						storeSkus, _ := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID2}, []int{vv.SkuID})
+						if len(storeSkus) > 0 {
+							for _, storeSku := range storeSkus {
+								if storeSku.JdsID != 0 {
+									status := vv.Status
+									stock := vv.Stock
+									price := vv.VendorPrice
+									if status == model.StoreSkuBindStatusNormal {
+										api.JdShop2API.StoreWareDoUpdate(status, storeSku.JdsID, vendorStoreID)
+									}
+									if stock != 0 {
+										api.JdShop2API.StoreUpdateStock(stock, storeSku.JdsID, vendorStoreID)
+									}
+									api.JdShop2API.StoreUpdatePrice(utils.Float64ToStr(jxutils.IntPrice2Standard(int64(price))), storeSku.JdsID, vendorStoreID)
 								}
-								if stock != 0 {
-									api.JdShop2API.StoreUpdateStock(stock, vv.JdsID, vendorStoreID)
-								}
-								api.JdShop2API.StoreUpdatePrice(utils.Float64ToStr(jxutils.IntPrice2Standard(int64(price))), vv.JdsID, vendorStoreID)
 							}
 						}
 					}