Merge branch 'feature-2020/8/6-McCafe-会阳' into develop

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

@@ -1194,6 +1194,7 @@ public class OrderAdapter {
             responseVo.setCustomerScorePrompt(customerScorePrompt);
             //优惠总金额=优惠券金额+满减金额+限时折扣金额
             responseVo.setDiscountTotalAmount(discountTotalAmount);
+            responseVo.setDownstreamThirdOrderCode(ordersBean.getDownstreamThirdOrderCode());
             responseVo.setEnableRefund(false);
             if (OrderStatus.TAKE_ORDER.getCode().equals(ordersBean.getStatus()) && PayStatus.HAVE_PAID.getCode().equals(ordersBean.getPayStatus())) {
                 responseVo.setEnableRefund(true);
@@ -1585,7 +1586,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/entities/vo/QueryOrderResponseVo.java

@@ -352,6 +352,11 @@ public class QueryOrderResponseVo {
      */
     private Integer bizType;
 
+    /**
+     * 麦咖啡餐道订单号
+     */
+    private String downstreamThirdOrderCode;
+
     @Data
     public static class OrderStatusFlow {
         /**

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;