- add GoodsOrder.PickDeadline

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:"-"`

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"])),

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)),

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)),

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"])),

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)),