From 5d6dae4c1272e0bb39f66131b3bb35a2fcc9af53 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, 9 Mar 2020 15:30:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=AE=A2=E5=8D=95=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=BF=98=E4=BA=86=E5=8A=A0fromstoreid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go                 | 9 +++++----
 business/partner/purchase/jx/localjx/order.go | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 5a9afac95..959eedd11 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -264,10 +264,11 @@ func Init() {
 }
 
 func syncStoreSku() {
-	syncFlag := model.SyncFlagPriceMask
-	if (time.Now().Unix()/24*3600)%10 == 0 {
-		syncFlag |= model.SyncFlagSaleMask
-	}
+	syncFlag := 0
+	// syncFlag := model.SyncFlagPriceMask
+	// if (time.Now().Unix()/24*3600)%10 == 0 {
+	// 	syncFlag |= model.SyncFlagSaleMask
+	// }
 	task := tasksch.NewParallelTask("同步京西与平台数据", nil, jxcontext.AdminCtx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			step := batchItemList[0].(int)
diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 8bfbbeea0..a15b6e13c 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -570,7 +570,7 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd
 	}
 	order.TotalShopMoney += jxOrder.FreightPrice
 	order.ActualPayPrice = order.TotalShopMoney
-
+	order.FromStoreID = jxOrder.FromStoreID
 	return order, err
 }