Commit ad1ca083 by dingkai

配送状态-1处理

parent 5cb8e634
...@@ -1460,7 +1460,8 @@ public class OrderAdapter { ...@@ -1460,7 +1460,8 @@ public class OrderAdapter {
} }
//TODO 判断配送中的逻辑 如果是有第三方配送,要查询第三方配送信息,显示骑手信息 如果有骑手信息 显示 联系骑手 //TODO 判断配送中的逻辑 如果是有第三方配送,要查询第三方配送信息,显示骑手信息 如果有骑手信息 显示 联系骑手
if (OrderStatus.DISTRIBUTION.getCode().equals(orderBean.getStatus())) { if (OrderStatus.DISTRIBUTION.getCode().equals(orderBean.getStatus())) {
if (orderBean.getDeliverStatus() == null || DeliverStatus.OTHER.getCode().equals(orderBean.getDeliverStatus())) { if (orderBean.getDeliverStatus() == null || DeliverStatus.OTHER.getCode().equals(orderBean.getDeliverStatus())
|| DeliverStatus.DELIVER_OTHER.getCode().equals(orderBean.getDeliverStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.DISTRIBUTION.getCode()); orderViewStatusDto.setOrderStatus(OrderStatus.DISTRIBUTION.getCode());
orderViewStatusDto.setOrderStatusDesc("配送中"); orderViewStatusDto.setOrderStatusDesc("配送中");
orderViewStatusDto.setOrderStatusDescText("请稍等片刻,美味即将到达哦~"); orderViewStatusDto.setOrderStatusDescText("请稍等片刻,美味即将到达哦~");
......
...@@ -14,6 +14,7 @@ package cn.freemud.enums; ...@@ -14,6 +14,7 @@ package cn.freemud.enums;
*/ */
public enum DeliverStatus { public enum DeliverStatus {
DELIVER_OTHER(-1,"未处理"),
OTHER(-2,"未处理"), OTHER(-2,"未处理"),
WATINGORDER(0,"待接单"), WATINGORDER(0,"待接单"),
SYSTEMGETORDER(1,"系统接单"), SYSTEMGETORDER(1,"系统接单"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment