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

business/partner/purchase/ebai/order.go

@@ -105,6 +105,9 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 		order.BusinessType = model.BusinessTypeImmediate
 	} else {
 		order.BusinessType = model.BusinessTypeDingshida
+		if jxutils.IsTimeEmpty(order.ExpectedDeliveredTime) {
+			order.ExpectedDeliveredTime = getTimeFromInterface(orderMap["latest_send_time"])
+		}
 	}
 
 	deliveryGeo := userMap["coord"].(map[string]interface{})
@@ -272,7 +275,7 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *ebaiapi.CallbackMsg) (orderSta
 	return orderStatus
 }
 
-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,