Merge branches 'feature/20200424_订单详情订单状态错误修改_wuping' and 'master' of…

Merge branches 'feature/20200424_订单详情订单状态错误修改_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1426,7 +1426,7 @@ public class OrderAdapter {
             }
             //TODO 判断配送中的逻辑 如果是有第三方配送，要查询第三方配送信息，显示骑手信息 如果有骑手信息 显示 联系骑手
             if (OrderStatus.DISTRIBUTION.getCode().equals(orderBean.getStatus())) {
-                if (orderBean.getDeliverStatus() == null) {
+                if (orderBean.getDeliverStatus() == null || DeliverStatus.OTHER.getCode().equals(orderBean.getDeliverStatus())) {
                     orderViewStatusDto.setOrderStatus(OrderStatus.DISTRIBUTION.getCode());
                     orderViewStatusDto.setOrderStatusDesc("配送中");
                     orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");

order-application-service/src/main/java/cn/freemud/enums/DeliverStatus.java

@@ -14,6 +14,7 @@ package cn.freemud.enums;
  */
 public enum DeliverStatus {
 
+    OTHER(-2,"未处理"),
     WATINGORDER(0,"待接单"),
     SYSTEMGETORDER(1,"系统接单"),
     ALLOTRIDER(2,"分配骑手"),