Commit 2d8dc2f9 by 刘鹏飞

针对美业修改下单成功文案

parent 554851de
...@@ -1616,7 +1616,7 @@ public class OrderAdapter { ...@@ -1616,7 +1616,7 @@ public class OrderAdapter {
if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) { if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) { if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.TAKE_ORDER.getCode()); orderViewStatusDto.setOrderStatus(OrderStatus.TAKE_ORDER.getCode());
orderViewStatusDto.setOrderStatusDesc("下单成功"); orderViewStatusDto.setOrderStatusDesc(conventCreateOrderString(orderBean));
orderViewStatusDto.setOrderStatusDescText("目前有" + orderBean.getQueueIndex() + "人在排队,凭此页到店领取哦~"); orderViewStatusDto.setOrderStatusDescText("目前有" + orderBean.getQueueIndex() + "人在排队,凭此页到店领取哦~");
if (StringUtils.isBlank(orderBean.getQueueIndex()) || "0".equals(orderBean.getQueueIndex())) { if (StringUtils.isBlank(orderBean.getQueueIndex()) || "0".equals(orderBean.getQueueIndex())) {
orderViewStatusDto.setOrderStatusDescText("凭此页到店领取哦~"); orderViewStatusDto.setOrderStatusDescText("凭此页到店领取哦~");
...@@ -1731,7 +1731,7 @@ public class OrderAdapter { ...@@ -1731,7 +1731,7 @@ public class OrderAdapter {
orderViewStatusDto.setButtonContactPartner(true); orderViewStatusDto.setButtonContactPartner(true);
} else { } else {
orderViewStatusDto.setOrderStatus(OrderStatus.RECEIPT.getCode()); orderViewStatusDto.setOrderStatus(OrderStatus.RECEIPT.getCode());
orderViewStatusDto.setOrderStatusDesc("制作中"); orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
orderViewStatusDto.setOrderStatusDescText("请稍等片刻,美味即将到达哦~"); orderViewStatusDto.setOrderStatusDescText("请稍等片刻,美味即将到达哦~");
orderViewStatusDto.setRiderName(StringUtils.isEmpty(orderBean.getRiderName()) ? "处理中" : orderBean.getRiderName()); orderViewStatusDto.setRiderName(StringUtils.isEmpty(orderBean.getRiderName()) ? "处理中" : orderBean.getRiderName());
orderViewStatusDto.setRiderText(StringUtils.isEmpty(orderBean.getRiderName()) ? "正在为您匹配配送员" : "配送员"); orderViewStatusDto.setRiderText(StringUtils.isEmpty(orderBean.getRiderName()) ? "正在为您匹配配送员" : "配送员");
...@@ -4050,14 +4050,26 @@ public class OrderAdapter { ...@@ -4050,14 +4050,26 @@ public class OrderAdapter {
/** /**
* 转换制作中的文案,美业用下单成功,其他用制作中 * 转换制作中的文案,美业用待使用,其他用制作中
* @param orderBean * @param orderBean
* @return * @return
*/ */
public String conventProduceString(QueryOrdersResponse.DataBean.OrderBean orderBean) { public String conventProduceString(QueryOrdersResponse.DataBean.OrderBean orderBean) {
if(String.valueOf(OrderClientType.BEAUTIFUL.getIndex()).equals(orderBean.getOrderClient())){ if(String.valueOf(OrderClientType.BEAUTIFUL.getIndex()).equals(orderBean.getOrderClient())){
return "下单成功"; return "待使用";
} }
return "制作中"; return "制作中";
} }
/**
* 转换待使用的文案,美业用待使用,其他用制作中
* @param orderBean
* @return
*/
public String conventCreateOrderString(QueryOrdersResponse.DataBean.OrderBean orderBean) {
if(String.valueOf(OrderClientType.BEAUTIFUL.getIndex()).equals(orderBean.getOrderClient())){
return "待使用";
}
return "下单成功";
}
} }
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