Merge branch 'KA-支持门店手动创建运单，通知骑手到店取餐20210915-zxh' into qa

order-management/src/main/java/cn/freemud/management/service/OrderBaseService.java

@@ -101,9 +101,9 @@ public class OrderBaseService {
      * @param orderCode
      * @param deliveryId
      */
-    public void updateDeliveryAbnormal(String partnerId, String orderCode, String deliveryId, String operator) {
+    public void updateDeliveryAbnormal(String partnerId, String orderCode, String deliveryId, String operator,String msg) {
         AssortmentUpdateDeliveryAbnormalRequest request = AssortmentUpdateDeliveryAbnormalRequest.builder()
-                .abnormalDesc("配送异常")
+                .abnormalDesc("配送异常"+ msg)
                 .deliveryId(deliveryId)
                 .orderCode(orderCode)
                 .partnerId(partnerId)

order-management/src/main/java/cn/freemud/management/service/handle/DeliveryHandle.java

@@ -102,8 +102,8 @@ public class DeliveryHandle {
         //创建配送单失败，更新订单为异常单
         if (deliveryResponse == null || SUCCESS != deliveryResponse.getCode() || deliveryResponse.getData() == null) {
             String deliveryId = deliveryResponse != null && deliveryResponse.getData() != null ? deliveryResponse.getData().getDeliveryId() : "";
-            orderBaseService.updateDeliveryAbnormal(orderBean.getCompanyId(), orderBean.getOid(), deliveryId, operator);
-            return ResponseUtil.success();
+            orderBaseService.updateDeliveryAbnormal(orderBean.getCompanyId(), orderBean.getOid(), deliveryId, operator, deliveryResponse == null ? "" : deliveryResponse.getMsg());
+            return ResponseUtil.error(deliveryResponse == null ? "调用配送服务失败" : deliveryResponse.getMsg());
         }
         // 创建配送单成功
         orderBaseService.updateDeliverySuccess(orderBean.getOid(), deliveryResponse.getData().getDeliveryId(), operator);