Merge remote-tracking branch 'origin/master'

doum

8 天以前 b7d451c91ec40bee70f23b1e2cf6a8797643faef

 server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java

@@ -3624,6 +3624,7 @@
        ActiveOrderTipVO vo = new ActiveOrderTipVO();
        vo.setOrderId(order.getId());
        vo.setStatus(order.getStatus());
        vo.setStatusDesc(Constants.OrderStatus.getDescByKey(order.getStatus(), order.getType()));

        // 构建提示文案
        boolean isLocal = Constants.equalsInteger(order.getType(), Constants.ZERO);