- big refactor for scheduler.

business/controller/jd/order.go

@@ -90,6 +90,12 @@ func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err
 			Skus:                  []*model.OrderSku{},
 		}
 		order.Status = c.GetStatusFromVendorStatus(order.VendorStatus)
+		businessTage := utils.Interface2String(result["businessTag"])
+		if strings.Index(businessTage, "dj_aging_immediately") >= 0 {
+			order.BusinessType = model.BusinessTypeImmediate
+		} else {
+			order.BusinessType = model.BusinessTypeDingshida
+		}
 		coordinateType := utils.Interface2Int64WithDefault(result["buyerCoordType"], 1)
 		originalLng := utils.MustInterface2Float64(result["buyerLng"])
 		originalLat := utils.MustInterface2Float64(result["buyerLat"])
@@ -183,32 +189,20 @@ func (c *OrderController) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
 
 func (c *OrderController) PickedUpGoods(order *model.GoodsOrder) (err error) {
 	_, err = api.JdAPI.OrderJDZBDelivery(order.VendorOrderID)
-	return c.translateOrderRelatedErr(err)
+	return err
 }
 
 func (c *OrderController) Swtich2SelfDeliver(order *model.GoodsOrder) (err error) {
 	_, err = api.JdAPI.ModifySellerDelivery(order.VendorOrderID)
-	return c.translateOrderRelatedErr(err)
+	return err
 }
 
 func (c *OrderController) SelfDeliverDelievering(order *model.GoodsOrder) (err error) {
 	_, err = api.JdAPI.OrderSerllerDelivery(order.VendorOrderID)
-	return c.translateOrderRelatedErr(err)
+	return err
 }
 
 func (c *OrderController) SelfDeliverDelievered(order *model.GoodsOrder) (err error) {
 	_, err = api.JdAPI.DeliveryEndOrder(order.VendorOrderID)
 	return err
 }
-
-func (c *OrderController) translateOrderRelatedErr(err error) (retVal error) {
-	if err != nil {
-		if errWithCode, ok := err.(*utils.ErrorWithCode); ok {
-			if errWithCode.Level() == 1 && errWithCode.Code() == jdapi.ResponseInnerCodeOrderAlreadyPickedUp {
-				return nil
-			}
-		}
-		return scheduler.ErrStatusIsNotOKForOperation
-	}
-	return nil
-}