Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

business/partner/purchase/tao_vegetable/order.go

@@ -842,7 +842,7 @@ func (c *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.Goods
 
 	if err = api.DeliveryFinish(param); err != nil {
 		globals.SugarLogger.Debugf("PickupGoods  拣货失败可能是BizSubOrderId 没填写 : %s", err.Error())
-		return err
+		return fmt.Errorf("订单缺过失败,请拣货完成前取货.或者联系客户发起部分退款")
 	}
 	c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp)
 	return nil