- 处理自配送门店非立即达订单的发运单时间问题

business/partner/purchase/mtwm/order.go

@@ -65,7 +65,6 @@ func (p *PurchaseHandler) GetOrder(vendorOrderID string) (order *model.GoodsOrde
 func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
 	result := orderData
 	vendorOrderID := utils.Int64ToStr(utils.MustInterface2Int64(result["order_id"]))
-	deliveryTime := utils.Interface2Int64WithDefault(result["delivery_time"], 0)
 	// 因为美团外卖不能自动设置商家门店号，且只能通过商家门店号来访问门店，
 	// 为了在后台设置简单一致，把app_poi_code直接当成平台门店号使用(即在后台设置时，平台门店号与商家门店号一样)
 	// 订单中wm_poi_id实际来平台门店号，app_poi_code为商家门店号，这样一来，这两个就相同了
@@ -83,7 +82,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 		ConsigneeAddress:      result["recipient_address"].(string),
 		CoordinateType:        model.CoordinateTypeMars,
 		BuyerComment:          utils.TrimBlankChar(utils.Interface2String(result["caution"])),
-		ExpectedDeliveredTime: getTimeFromTimestamp(deliveryTime),
+		ExpectedDeliveredTime: getTimeFromTimestamp(utils.Interface2Int64WithDefault(result["delivery_time"], 0)),
 		PickDeadline:          utils.DefaultTimeValue,
 		VendorStatus:          utils.Int64ToStr(utils.MustInterface2Int64(result["status"])),
 		OrderSeq:              int(utils.MustInterface2Int64(result["day_seq"])),
@@ -93,7 +92,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 		Skus:                  []*model.OrderSku{},
 	}
 	order.Status = p.GetStatusFromVendorStatus(order.VendorStatus)
-	if deliveryTime == 0 {
+	if jxutils.IsTimeEmpty(order.ExpectedDeliveredTime) {
 		order.BusinessType = model.BusinessTypeImmediate
 	} else {
 		order.BusinessType = model.BusinessTypeDingshida
@@ -277,7 +276,7 @@ func (c *PurchaseHandler) RefreshRealMobile(ctx *jxcontext.Context, fromTime, to
 	return hint, err
 }
 
-func (c *PurchaseHandler) GetStatusActionTimeout(statusType, status int) (params *partner.StatusActionParams) {
+func (c *PurchaseHandler) GetStatusActionTimeout(order *model.GoodsOrder, statusType, status int) (params *partner.StatusActionParams) {
 	if statusType == scheduler.TimerStatusTypeOrder && status == model.OrderStatusAccepted {
 		params = &partner.StatusActionParams{ // 美团外卖要求在5分钟内拣货，不然订单会被取消
 			Timeout:    pickupOrderDelay,