Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由'

order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

@@ -1193,8 +1193,11 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         baseResponseDto.setErrcode(100);
         if (orderBean.getType() == 1 && orderBean.getAddInfo() != null) {
             Integer deliverStatus = orderBean.getDeliverStatus();
-            if (ObjectUtils.equals(cn.freemud.management.enums.DeliveryStatus.DELIVERYERROR.getCode(), deliverStatus)
-                    || ObjectUtils.equals(cn.freemud.management.enums.DeliveryStatus.DELIVERYCANCEL.getCode(), deliverStatus)
+            if (ObjectUtils.equals(cn.freemud.management.enums.DeliveryStatus.DELIVERYERROR.getCode(), deliverStatus)) {
+                baseResponseDto.setErrmsg(CancelDeliveryResponseDto.notCollectMsg);
+                return baseResponseDto;
+            }
+            if (ObjectUtils.equals(cn.freemud.management.enums.DeliveryStatus.DELIVERYCANCEL.getCode(), deliverStatus)
                     || ObjectUtils.equals(cn.freemud.management.enums.DeliveryStatus.DELIVERYARRIVED.getCode(), deliverStatus)) {
                 return baseResponseDto;
             }