Merge branch 'feature/20210316_小程序外卖单运单异常不取消配送单_wuping' of…

Merge branch 'feature/20210316_小程序外卖单运单异常不取消配送单_wuping' of http://gitlab.freemud.com/order-group-application/order-group

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -172,9 +172,9 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
             sendException(request.getOrderId(),request.getExceptionDesc(),request.getUpdateTime(),DeliveryStatus.getDeliveryStatusByCode(deliveryStatus).getDesc());
             // 取消外卖中台配送单 订单异常
             // 如果 "配送单异常并且顾客更改配送地址" 不取消配送单
-            if (!isDeliveryAbnormalAndCustomerChangedAddress(request)) {
-                partnerCancelOrder(request.getDeliveryId());
-            }
+//            if (!isDeliveryAbnormalAndCustomerChangedAddress(request)) {
+//                partnerCancelOrder(request.getDeliveryId());
+//            }
             // 运单异常，取消订单
             posBaseRequestDto.setReason("没有骑手接单");
             posBaseRequestDto.setDeliveryId(request.getDeliveryId());