From cb51f0436ca7ce8e69175b17bb0bd2638145ec24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 2 Jun 2020 14:44:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E7=89=9B=E8=82=89=E5=88=86=E7=B1=BB=E7=83=AD=E5=8D=96=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 415e99382..1cf05436b 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -608,7 +608,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		values2, _, err2 := api.JdShopAPI.FindValuesByAttrId(150390)
 		err = err2
 		for _, v := range values2 {
-			if v.Name == "其他" {
+			if v.Name == "其它" {
 				exValueID = v.ID
 			}
 		}

From c7a6fdc0837114fa16aca488a78c499a9e463c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 2 Jun 2020 16:24:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/order.go | 47 +++++++++++++++++++++--
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go
index f68ad75e9..52588dd17 100644
--- a/business/partner/purchase/jdshop/order.go
+++ b/business/partner/purchase/jdshop/order.go
@@ -1,11 +1,14 @@
 package jdshop
 
 import (
+	"time"
+
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
@@ -109,6 +112,14 @@ func (p *PurchaseHandler) GetJdsOrders(ctx *jxcontext.Context, orderCreatedStart
 
 func result2Orders(result *jdshopapi.AllOrdersResult) (orders []*model.GoodsOrder, err error) {
 	for _, jdsOrder := range result.OrderList {
+		if jdsOrder.OrderStatus == jdshopapi.JdsOrderStatusWaittingPay {
+			continue
+		}
+		orderDetail, err := api.JdShopAPI.OrderDetail(utils.Int64ToStr(jdsOrder.OrderID))
+		if err != nil {
+			globals.SugarLogger.Debugf("jds OrderDetail error: %v", err.Error())
+			continue
+		}
 		order := &model.GoodsOrder{
 			VendorOrderID:    utils.Int64ToStr(jdsOrder.OrderID),
 			VendorID:         model.VendorIDJDShop,
@@ -116,9 +127,39 @@ func result2Orders(result *jdshopapi.AllOrdersResult) (orders []*model.GoodsOrde
 			VendorStatus:     utils.Int2Str(jdsOrder.OrderStatus),
 			VendorUserID:     jdsOrder.UserPin,
 			BuyerComment:     jdsOrder.UserRemark,
-			// PickDeadline:     utils.DefaultTimeValue,
-			OriginalData: string(utils.MustMarshal(jdsOrder)),
-			StoreName:    jdsOrder.StoreName,
+			PickDeadline:     utils.DefaultTimeValue,
+			OriginalData:     string(utils.MustMarshal(jdsOrder)),
+			StoreName:        jdsOrder.StoreName,
+			OrderCreatedAt:   utils.Str2Time(jdsOrder.OrderCreateTime + ":00"),
+			ConsigneeAddress: orderDetail.ConsigneeAddress,
+			ConsigneeMobile:  orderDetail.ConsigneeMobile,
+			ConsigneeName:    orderDetail.ConsigneeName,
+			ActualPayPrice:   orderDetail.ActualPayPrice,
+			// TotalShopMoney:   orderDetail.ActualPayPrice * jdshopapi.JdsPayPercentage,
+		}
+		//如果是暂停，表示是预订单
+		if jdsOrder.OrderStatus == jdshopapi.JdsOrderStatusPause {
+			order.BusinessType = model.BusinessTypeDingshida
+			order.ExpectedDeliveredTime = utils.Str2Time(orderDetail.ExpectedDeliveredTime)
+		} else if jdsOrder.OrderStatus == jdshopapi.JdsOrderStatusWaittingExport {
+			order.ExpectedDeliveredTime = order.CreatedAt.Add(time.Hour)
+			order.BusinessType = model.BusinessTypeImmediate
+		} else {
+			globals.SugarLogger.Errorf("未知的京东商城订单状态！status : %V", jdsOrder.OrderStatus)
+		}
+		for _, v := range jdsOrder.OrderItems {
+			sku := &model.OrderSku{
+				VendorID:      model.VendorIDJDShop,
+				VendorOrderID: utils.Int64ToStr(jdsOrder.OrderID),
+				Count:         v.SkuNum,
+				VendorSkuID:   utils.Int64ToStr(v.SkuID),
+				SkuName:       v.SkuName,
+				VendorPrice:   jxutils.StandardPrice2Int(v.JdPrice),
+				SalePrice:     jxutils.StandardPrice2Int(v.JdPrice),
+			}
+			_, _, _, specUnit, _, specQuality := jxutils.SplitSkuName(v.SkuName)
+			sku.Weight = jxutils.FormatSkuWeight(specQuality, specUnit)
+			order.Skus = append(order.Skus, sku)
 		}
 		orders = append(orders, order)
 	}