From a8fc0af431f55607ce833db114afe8b879c09395 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 15 Feb 2019 11:44:48 +0800
Subject: [PATCH] - add GoodsOrder.PickDeadline

---
 business/model/order.go                       | 1 +
 business/partner/purchase/ebai/order.go       | 1 +
 business/partner/purchase/elm/order.go        | 1 +
 business/partner/purchase/jd/order.go         | 1 +
 business/partner/purchase/mtwm/order.go       | 1 +
 business/partner/purchase/weimob/wsc/order.go | 1 +
 6 files changed, 6 insertions(+)

diff --git a/business/model/order.go b/business/model/order.go
index 6ee044b7f..b247d46b4 100644
--- a/business/model/order.go
+++ b/business/model/order.go
@@ -44,6 +44,7 @@ type GoodsOrder struct {
 	OrderCreatedAt        time.Time `orm:"type(datetime);index" json:"orderCreatedAt"`       // 这里记录的是订单生效时间，即用户支付完成（货到付款即为下单时间）
 	OrderFinishedAt       time.Time `orm:"type(datetime)" json:"orderFinishedAt"`
 	StatusTime            time.Time `orm:"type(datetime)" json:"-"` // last status time
+	PickDeadline          time.Time `orm:"type(datetime)" json:"pickDeadline"`
 	ModelTimeInfo         `json:"-"`
 	OriginalData          string      `orm:"-" json:"-"`
 	Skus                  []*OrderSku `orm:"-" json:"-"`
diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go
index 5c1d364bf..c29acd32a 100644
--- a/business/partner/purchase/ebai/order.go
+++ b/business/partner/purchase/ebai/order.go
@@ -69,6 +69,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 		CoordinateType:        model.CoordinateTypeBaiDu,
 		BuyerComment:          utils.TrimBlankChar(utils.Interface2String(orderMap["remark"])),
 		ExpectedDeliveredTime: getTimeFromTimestampStr(utils.Interface2String(orderMap["send_time"])),
+		PickDeadline:          utils.DefaultTimeValue,
 		VendorStatus:          utils.Int64ToStr(utils.MustInterface2Int64(orderMap["status"])),
 		OrderSeq:              int(utils.Str2Int64(utils.Interface2String(orderMap["order_index"]))),
 		StatusTime:            getTimeFromTimestampStr(utils.Interface2String(orderMap["create_time"])),
diff --git a/business/partner/purchase/elm/order.go b/business/partner/purchase/elm/order.go
index b55e5a724..fb6852571 100644
--- a/business/partner/purchase/elm/order.go
+++ b/business/partner/purchase/elm/order.go
@@ -149,6 +149,7 @@ func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 		ConsigneeAddress:      result["address"].(string),
 		BuyerComment:          utils.TrimBlankChar(utils.Interface2String(result["description"])),
 		ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["deliverTime"]), utils.DefaultTimeValue),
+		PickDeadline:          utils.DefaultTimeValue,
 		VendorStatus:          utils.Interface2String(result["status"]), // 取订单的原始status，不合并消息类型（因为当前消息类型没有意义）
 		OrderSeq:              int(utils.MustInterface2Int64(result["daySn"])),
 		StatusTime:            utils.Str2Time(result["activeAt"].(string)),
diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go
index 8bc733d9f..72947f414 100644
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -105,6 +105,7 @@ func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 		CoordinateType:        model.CoordinateTypeMars,
 		BuyerComment:          utils.TrimBlankChar(utils.Interface2String(result["orderBuyerRemark"])),
 		ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["orderPreEndDeliveryTime"]), utils.DefaultTimeValue),
+		PickDeadline:          utils.Str2Time(result["pickDeadline"].(string)),
 		VendorStatus:          utils.Int64ToStr(utils.MustInterface2Int64(result["orderStatus"])),
 		OrderSeq:              int(utils.MustInterface2Int64(result["orderNum"])),
 		StatusTime:            utils.Str2Time(result["orderPurchaseTime"].(string)),
diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go
index cb8e26d7d..d9eac87fc 100644
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -66,6 +66,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 		CoordinateType:        model.CoordinateTypeMars,
 		BuyerComment:          utils.TrimBlankChar(utils.Interface2String(result["caution"])),
 		ExpectedDeliveredTime: getTimeFromTimestamp(deliveryTime),
+		PickDeadline:          utils.DefaultTimeValue,
 		VendorStatus:          utils.Int64ToStr(utils.MustInterface2Int64(result["status"])),
 		OrderSeq:              int(utils.MustInterface2Int64(result["day_seq"])),
 		StatusTime:            getTimeFromTimestamp(utils.MustInterface2Int64(result["ctime"])),
diff --git a/business/partner/purchase/weimob/wsc/order.go b/business/partner/purchase/weimob/wsc/order.go
index d52979af8..c64d72e89 100644
--- a/business/partner/purchase/weimob/wsc/order.go
+++ b/business/partner/purchase/weimob/wsc/order.go
@@ -130,6 +130,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 		ConsigneeLat:          jxutils.StandardCoordinate2Int(utils.Str2Float64(utils.Interface2String(logisticsDeliveryDetail["receiverLatitude"]))),
 		BuyerComment:          utils.Interface2String(result["buyerRemark"]),
 		ExpectedDeliveredTime: utils.DefaultTimeValue,
+		PickDeadline:          utils.DefaultTimeValue,
 		VendorStatus:          utils.Int64ToStr(utils.MustInterface2Int64(result["orderStatus"])),
 		StatusTime:            utils.Timestamp2Time(utils.MustInterface2Int64(result["createTime"]) / 1000),
 		OriginalData:          string(utils.MustMarshal(result)),