From 1cd045ca35428f961a7b918d799e9c7aa5536b47 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, 29 May 2020 16:11:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E5=9B=A2=E4=BF=AE=E6=94=B9=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/order.go    | 4 +++-
 business/partner/purchase/mtwm/store_sku2.go | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go
index 288df6ce8..2c2dfec36 100644
--- a/business/partner/purchase/jdshop/order.go
+++ b/business/partner/purchase/jdshop/order.go
@@ -17,7 +17,9 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 	utils.Map2StructByJson(orderData, &result, false)
 	jdsOrder := result.OrderList[0]
 	order = &model.GoodsOrder{
-		VendorOrderID: utils.Int64ToStr(jdsOrder.OrderID),
+		VendorOrderID:  utils.Int64ToStr(jdsOrder.OrderID),
+		VendorID:       model.VendorIDJDShop,
+		OrderCreatedAt: utils.Str2Time(jdsOrder.OrderCreateTime + ":00"),
 	}
 	return order
 }
diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go
index a1e95fee9..d33a2e9dc 100644
--- a/business/partner/purchase/mtwm/store_sku2.go
+++ b/business/partner/purchase/mtwm/store_sku2.go
@@ -246,7 +246,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 		syncType = "更新商品"
 	}
 	for i, storeSku := range storeSkuList {
-		// isNeedUpdatePrice := isCreate //storeSku.SkuSyncStatus&( model.SyncFlagPriceMask| model.SyncFlagNewMask) != 0
+		isNeedUpdatePrice := isCreate //storeSku.SkuSyncStatus&( model.SyncFlagPriceMask| model.SyncFlagNewMask) != 0
 		foodData := make(map[string]interface{})
 		foodDataList[i] = foodData
 		foodData[mtwmapi.KeyAppFoodCode] = utils.Int2Str(storeSku.SkuID)
@@ -258,9 +258,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 		foodData["skus"] = skus
 		foodData["name"] = utils.LimitUTF8StringLen(utils.FilterEmoji(storeSku.SkuName), mtwmapi.MaxSkuNameCharCount)
 		foodData["description"] = storeSku.Comment
-		// if isNeedUpdatePrice {
-		foodData["price"] = jxutils.IntPrice2Standard(storeSku.VendorPrice)
-		// }
+		if isNeedUpdatePrice {
+			foodData["price"] = jxutils.IntPrice2Standard(storeSku.VendorPrice)
+		}
 		foodData["min_order_count"] = 1
 		foodData["unit"] = storeSku.Unit
 		foodData["box_num"] = 1