- fixed get latest order status bug.

- add GoodsOrder.VendorWaybillID.

business/controller/jd/order.go

@@ -194,6 +194,19 @@ func (c *OrderController) PickedUpGoods(order *model.GoodsOrder) (err error) {
 
 func (c *OrderController) Swtich2SelfDeliver(order *model.GoodsOrder) (err error) {
 	_, err = api.JdAPI.ModifySellerDelivery(order.VendorOrderID)
+	if err != nil {
+		if errWithCode, ok := err.(*utils.ErrorWithCode); ok && errWithCode.Level() == 1 {
+			globals.SugarLogger.Infof("Swtich2SelfDeliver failed with error:%v try get current status", err)
+			if order2, err2 := c.GetOrder(order.VendorOrderID); err2 == nil {
+				var mapData map[string]interface{}
+				if err2 = utils.UnmarshalUseNumber([]byte(order2.OriginalData), &mapData); err2 == nil {
+					if utils.Interface2String(mapData["deliveryCarrierNo"]) == "2938" { // 当前已经是自送状态了
+						err = nil
+					}
+				}
+			}
+		}
+	}
 	return err
 }