订单汇集

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

@@ -1523,7 +1523,8 @@ public class OrderAdapter {
                 } else {
                     if (DeliverStatus.WATINGORDER.getCode().equals(orderBean.getDeliverStatus()) || DeliverStatus.SYSTEMGETORDER.getCode().equals(orderBean.getDeliverStatus())
                             || DeliverStatus.ALLOTRIDER.getCode().equals(orderBean.getDeliverStatus())
-                            || DeliverStatus.RIDERARRIVESTORE.getCode().equals(orderBean.getDeliverStatus())) {
+                            || DeliverStatus.RIDERARRIVESTORE.getCode().equals(orderBean.getDeliverStatus())
+                            || DeliverStatus.DELIVERYCOLLECT.getCode().equals(orderBean.getDeliverStatus())) {
                         orderViewStatusDto.setOrderStatus(OrderViewStatus.RIDERDELIVERY.getCode());
                         orderViewStatusDto.setOrderStatusDesc("骑手取餐中");
                         orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");

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

@@ -24,7 +24,9 @@ public enum DeliverStatus {
     RIDERSTARTDELIVERY(5,"开始配送"),
     DELIVERYARRIVED(6,"运单送达"),
     DELIVERYERROR(7,"运单异常"),
-    DELIVERYCANCEL(8,"运单取消");
+    DELIVERYCANCEL(8,"运单取消"),
+    //麦咖啡专用 运单汇集
+    DELIVERYCOLLECT(99,"运单汇集");
 
     private Integer code;
     private String desc;