From b169d66a488f6f8d0cfb159a119769e261881cec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 18 Jun 2020 15:47:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=B0=B4=E5=8D=B0=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E6=AF=8F=E6=99=9A=E8=87=AA=E5=8A=A8=E8=B7=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go |  2 +-
 business/jxstore/cms/sync.go          | 30 +++++++++++++++++++--------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 772fcc015..5f3952da3 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -1192,7 +1192,7 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 		return "", err
 	}
 	//重新构建order的数据
-	storeMaps, err := dao.GetStoresMapList(db, []int{order.VendorID}, []int{order.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
+	storeMaps, err := dao.GetStoresMapList(db, []int{order.VendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
 	stores, err := dao.GetStoreList(db, []int{storeID}, nil, nil, nil, "")
 	if len(storeMaps) > 0 && len(stores) > 0 {
 		order.StoreID = storeID
diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index 634d0d14d..54fa95b53 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -1222,14 +1222,26 @@ func SyncSkuExperfixAndWatermark(ctx *jxcontext.Context) (err error) {
 	var (
 		db = dao.GetDB()
 	)
-	dao.GetSkuExinfos(db, nil, []int{model.VendorIDMTWM, model.VendorIDEBAI, model.VendorIDJD}, "", utils.ZeroTimeValue, utils.ZeroTimeValue)
-	// task := tasksch.NewParallelTask("syncJdsStoreStock", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
-	// 	func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-	// 		storeSku := batchItemList[0].(*model.StoreSkuBind)
-
-	// 		return retVal, err
-	// 	}, storeSkus)
-	// tasksch.HandleTask(task, nil, true).Run()
-	// _, err = task.GetResult(0)
+	skuExinfos, err := dao.GetSkuExinfos(db, nil, []int{model.VendorIDMTWM, model.VendorIDEBAI, model.VendorIDJD}, "", utils.ZeroTimeValue, utils.ZeroTimeValue)
+	task := tasksch.NewParallelTask("SyncSkuExperfixAndWatermark", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
+		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+			skuExinfo := batchItemList[0].(*model.SkuExinfoMap)
+			skus, err := dao.GetSkus(db, nil, []int{skuExinfo.NameID}, nil, nil, nil)
+			var skuIDs []int
+			for _, v := range skus {
+				skuIDs = append(skuIDs, v.ID)
+			}
+			if partner.IsMultiStore(skuExinfo.VendorID) {
+				for _, v := range skuIDs {
+					OnUpdateThing(ctx, db, nil, int64(v), model.ThingTypeSku)
+				}
+				CurVendorSync.SyncSkus(ctx, db, nil, skuIDs, true, true, ctx.GetUserName())
+			} else {
+				CurVendorSync.SyncStoresSkus2(ctx, nil, 0, db, []int{skuExinfo.VendorID}, nil, false, skuIDs, nil, model.SyncFlagModifiedMask, true, true)
+			}
+			return retVal, err
+		}, skuExinfos)
+	tasksch.HandleTask(task, nil, true).Run()
+	_, err = task.GetResult(0)
 	return err
 }