From 3ea07ea2dd69fa4bf37f51d499615689cfced0fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 23 Jun 2020 11:47:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=AE=8C=E6=88=90=E6=99=AF?=
 =?UTF-8?q?=E7=94=B0=E5=BA=97=E4=B8=8A=E6=9E=B6=E4=B8=8D=E6=98=AF=E4=BA=AC?=
 =?UTF-8?q?=E7=8B=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go | 42 ++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index b30741720..667f1d49d 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -1090,7 +1090,7 @@ func (v *VendorSync) SyncJdsStoresSkus(ctx *jxcontext.Context, storeIDs []int, i
 	var (
 		db = dao.GetDB()
 	)
-	// storeSkus, _ := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID}, nil)
+	storeSkus, _ := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID}, nil)
 	_, hint, err = v.LoopStoresMap2(ctx, nil, db, fmt.Sprintf("同步京东商城库存商品信息:%v", storeIDs), isAsync, true, []int{model.VendorIDJDShop}, storeIDs, false,
 		func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
 			loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
@@ -1099,7 +1099,7 @@ func (v *VendorSync) SyncJdsStoresSkus(ctx *jxcontext.Context, storeIDs []int, i
 					if storeMap.Status > model.StoreStatusDisabled && storeMap.StoreID != model.JdShopMainStoreID && storeMap.SyncRule != 0 {
 						err = syncJdsStoresSkus(ctx, db, nil, storeMap, isAsync, isContinueWhenError)
 					}
-					// err = syncJdsStoreStock(ctx, db, storeSkus, storeMap)
+					err = syncJdsStoreStock(ctx, db, storeSkus, storeMap)
 				}
 			}
 			return nil, partner.AddVendorInfo2Err(err, loopMapInfo.VendorID)
@@ -1133,12 +1133,12 @@ func syncJdsStoreStock(ctx *jxcontext.Context, db *dao.DaoDB, storeSkus []*model
 
 func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch.ITask, storeMap *model.StoreMap, isAsync, isContinueWhenError bool) (err error) {
 	var (
-		mainSkusMap = make(map[int][]*dao.StoreSkuSyncInfo)
-		skusMap     = make(map[int][]*dao.StoreSkuSyncInfo)
-		updateList  []*dao.StoreSkuSyncInfo
-		addList     []*dao.StoreSkuSyncInfo
-		// skuBindInfos1 []*StoreSkuBindInfo
-		// skuBindInfos2 []*StoreSkuBindInfo
+		mainSkusMap   = make(map[int][]*dao.StoreSkuSyncInfo)
+		skusMap       = make(map[int][]*dao.StoreSkuSyncInfo)
+		updateList    []*dao.StoreSkuSyncInfo
+		addList       []*dao.StoreSkuSyncInfo
+		skuBindInfos1 []*StoreSkuBindInfo
+		skuBindInfos2 []*StoreSkuBindInfo
 	)
 	storeSkusMain, err := dao.GetStoreSkusByNameIDs(db, []int{model.JdShopMainStoreID}, 0)
 	for _, v := range storeSkusMain {
@@ -1178,21 +1178,21 @@ func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch
 			}
 		}
 	}
-	fmt.Println("updateList", utils.Format4Output(updateList, false))
+	// fmt.Println("updateList", utils.Format4Output(updateList, false))
 	// fmt.Println("addList", utils.Format4Output(addList, false))
-	// if len(updateList) > 0 {
-	// 	for _, v := range updateList {
-	// 		skuBindInfos1 = append(skuBindInfos1, buildStoreSkuBindInfo(db, storeMap.StoreID, v, false))
-	// 	}
-	// 	UpdateStoresSkusByBind(ctx, parentTask, skuBindInfos1, isAsync, isContinueWhenError, false)
-	// }
+	if len(updateList) > 0 {
+		for _, v := range updateList {
+			skuBindInfos1 = append(skuBindInfos1, buildStoreSkuBindInfo(db, storeMap.StoreID, v, false))
+		}
+		UpdateStoresSkusByBind(ctx, parentTask, skuBindInfos1, isAsync, isContinueWhenError, false)
+	}
 
-	// if len(addList) > 0 {
-	// 	for _, v := range addList {
-	// 		skuBindInfos2 = append(skuBindInfos2, buildStoreSkuBindInfo(db, storeMap.StoreID, v, true))
-	// 	}
-	// 	UpdateStoresSkusByBind(ctx, parentTask, skuBindInfos2, isAsync, isContinueWhenError, false)
-	// }
+	if len(addList) > 0 {
+		for _, v := range addList {
+			skuBindInfos2 = append(skuBindInfos2, buildStoreSkuBindInfo(db, storeMap.StoreID, v, true))
+		}
+		UpdateStoresSkusByBind(ctx, parentTask, skuBindInfos2, isAsync, isContinueWhenError, false)
+	}
 	return err
 }