From 72511208fb9e68ce5c6ec14c7930c4737b02f21e 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 17:57:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E8=AE=A2?=
 =?UTF-8?q?=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 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go
index 2c2dfec36..f4f932caf 100644
--- a/business/partner/purchase/jdshop/order.go
+++ b/business/partner/purchase/jdshop/order.go
@@ -3,6 +3,7 @@ package jdshop
 import (
 	"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/api"
@@ -17,9 +18,14 @@ 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),
-		VendorID:       model.VendorIDJDShop,
-		OrderCreatedAt: utils.Str2Time(jdsOrder.OrderCreateTime + ":00"),
+		VendorOrderID:    utils.Int64ToStr(jdsOrder.OrderID),
+		VendorID:         model.VendorIDJDShop,
+		BaseFreightMoney: jxutils.StandardPrice2Int(jdsOrder.Freight),
+		VendorStatus:     utils.Int2Str(jdsOrder.OrderStatus),
+		VendorUserID:     jdsOrder.UserPin,
+		BuyerComment:     jdsOrder.UserRemark,
+		PickDeadline:     utils.DefaultTimeValue,
+		OriginalData:     string(utils.MustMarshal(jdsOrder)),
 	}
 	return order
 }