From b6454df08a159e84d606d0ecbd4b5bd7b3c36b86 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, 7 Sep 2020 14:15:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E5=95=86?=
 =?UTF-8?q?=E5=93=81id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/callback.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go
index 1edf56b70..2666468fa 100644
--- a/business/partner/purchase/jdshop/callback.go
+++ b/business/partner/purchase/jdshop/callback.go
@@ -112,7 +112,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
 	if len(storeMaps) > 0 {
 		order.VendorStoreID = storeMaps[0].VendorStoreID
 	}
-	// 如果是暂停，表示是预订单
+	// 如果是暂停，表示是预订单g
 	if msg.OrderState == jdshopapi.OrderStatusPause || msg.OrderState == jdshopapi.OrderStatusPopPause {
 		order.BusinessType = model.BusinessTypeDingshida
 		if time, err := api.JdShopAPI.GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil {
@@ -153,7 +153,10 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
 			SkuName:       v.SkuName,
 			VendorPrice:   jxutils.StandardPrice2Int(utils.Str2Float64(v.JdPrice)),
 			SalePrice:     jxutils.StandardPrice2Int(utils.Str2Float64(v.JdPrice)),
-			SkuID:         utils.Str2Int(v.OuterSkuID),
+			// SkuID:         utils.Str2Int(v.OuterSkuID),
+		}
+		if v.OuterSkuID != "" {
+			sku.SkuID = utils.Str2Int(v.OuterSkuID)
 		}
 		_, _, _, specUnit, _, specQuality := jxutils.SplitSkuName(v.SkuName)
 		sku.Weight = jxutils.FormatSkuWeight(specQuality, specUnit)