From 4e9f514b039e0ccdef6ecd5ac1a90ee090621434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 31 Aug 2020 13:47:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=AC=E4=B8=9C=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E9=97=A8=E5=BA=97=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E7=9A=84=E4=B9=9F=E4=B8=80=E8=B5=B7?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go  | 61 ++++++++++++++++++++++++++++-------
 business/jxstore/misc/misc.go |  2 +-
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index 4a89efbd7..61aa4846a 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -1098,7 +1098,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)
@@ -1107,7 +1107,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, t, storeMap, isAsync, isContinueWhenError)
 					}
-					err = syncJdsStoreStock(ctx, db, t, storeSkus, storeMap, isAsync, isContinueWhenError)
+					// err = syncJdsStoreStock(ctx, db, t, storeSkus, storeMap, isAsync, isContinueWhenError)
 				}
 			}
 			return nil, partner.AddVendorInfo2Err(err, loopMapInfo.VendorID)
@@ -1116,15 +1116,6 @@ func (v *VendorSync) SyncJdsStoresSkus(ctx *jxcontext.Context, storeIDs []int, i
 }
 
 func syncJdsStoreStock(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch.ITask, storeSkus []*model.StoreSkuBind, storeMap *model.StoreMap, isAsync, isContinueWhenError bool) (err error) {
-	// storeMaps, err := dao.GetStoresMapList(db, []int{model.VendorIDJDShop}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
-	// if err != nil {
-	// 	return err
-	// }
-	// storeSkus, err := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID}, nil)
-	// if err != nil {
-	// 	return err
-	// }
-	// for _, storeMap := range storeMaps {
 	task := tasksch.NewParallelTask("syncJdsStoreStock", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			storeSku := batchItemList[0].(*model.StoreSkuBind)
@@ -1146,7 +1137,53 @@ func syncJdsStoreStock(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch
 		}, storeSkus)
 	tasksch.HandleTask(task, parentTask, true).Run()
 	_, err = task.GetResult(0)
-	// }
+	return err
+}
+
+func SyncJdsStoreStock(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (err error) {
+	var (
+		db        = dao.GetDB()
+		storeMaps []*model.StoreMap
+	)
+	sql := `
+		SELECT * FROM store_map WHERE vendor_id = ? AND vendor_store_id <> '' AND store_id <> ? 
+	`
+	sqlParams := []interface{}{
+		model.VendorIDJDShop, model.JdShopMainStoreID,
+	}
+	err = dao.GetRows(db, &storeMaps, sql, sqlParams)
+	storeSkus, err := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID}, nil)
+	if err != nil {
+		return err
+	}
+	task1 := tasksch.NewParallelTask("syncJdsStoreStock1", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx,
+		func(task1 *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+			storeMap := batchItemList[0].(*model.StoreMap)
+			task2 := tasksch.NewParallelTask("syncJdsStoreStock2", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx,
+				func(task2 *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+					storeSku := batchItemList[0].(*model.StoreSkuBind)
+					stock := 0
+					storeSku2, _ := dao.GetStoresSkusInfo(db, []int{storeMap.StoreID}, []int{storeSku.SkuID})
+					if storeSku.JdsID != 0 {
+						if len(storeSku2) > 0 {
+							if storeSku2[0].Status == model.StoreSkuBindStatusNormal && storeSku.Status == model.StoreSkuBindStatusNormal {
+								stock = 9999
+							}
+							if storeMap.VendorStoreID != "" {
+								err = api.JdShopAPI.UpdateSkuSiteStock(storeSku.JdsID, stock, utils.Str2Int(storeMap.VendorStoreID))
+							}
+						} else {
+							err = api.JdShopAPI.UpdateSkuSiteStock(storeSku.JdsID, 0, utils.Str2Int(storeMap.VendorStoreID))
+						}
+					}
+					return retVal, err
+				}, storeSkus)
+			tasksch.HandleTask(task2, task1, true).Run()
+			_, err = task2.GetResult(0)
+			return retVal, err
+		}, storeMaps)
+	tasksch.HandleTask(task1, nil, true).Run()
+	_, err = task1.GetResult(0)
 	return err
 }
 
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index fcba3d309..9ae375825 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -414,7 +414,7 @@ func doDailyWork2() {
 	//同步京东商城门店的商品
 	cms.CurVendorSync.SyncJdsStoresSkus(jxcontext.AdminCtx, nil, true, true)
 	//刷新京东商城的门店库存
-	// cms.SyncJdsStoreStock(jxcontext.AdminCtx, dao.GetDB(), nil, true, true)
+	cms.SyncJdsStoreStock(jxcontext.AdminCtx, true, true)
 }
 
 func doDailyWork() {