Commit 554851de by 刘鹏飞

针对美业修改制作中文案

parent 0f3627b0
......@@ -1641,7 +1641,7 @@ public class OrderAdapter {
if (OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())) {
if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.RECEIPT.getCode());
orderViewStatusDto.setOrderStatusDesc("制作中");
orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
orderViewStatusDto.setOrderStatusDescText("目前有" + orderBean.getQueueIndex() + "人在排队,凭此页到店领取哦~");
if (StringUtils.isBlank(orderBean.getQueueIndex()) || "0".equals(orderBean.getQueueIndex())) {
orderViewStatusDto.setOrderStatusDescText("凭此页到店领取哦~");
......@@ -1692,7 +1692,7 @@ public class OrderAdapter {
if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
if (orderBean.getDeliverStatus() == null) {
orderViewStatusDto.setOrderStatus(OrderStatus.TAKE_ORDER.getCode());
orderViewStatusDto.setOrderStatusDesc("下单成功");
orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
orderViewStatusDto.setOrderStatusDescText("请稍等片刻,美味即将到达哦~");
orderViewStatusDto.setButtonContactPartner(true);
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean,wxAppId));
......@@ -1701,7 +1701,7 @@ public class OrderAdapter {
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
} else {
orderViewStatusDto.setOrderStatus(OrderStatus.TAKE_ORDER.getCode());
orderViewStatusDto.setOrderStatusDesc("下单成功");
orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
orderViewStatusDto.setOrderStatusDescText("请稍等片刻,美味即将到达哦~");
orderViewStatusDto.setButtonContactPartner(true);
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean,wxAppId));
......@@ -1722,7 +1722,7 @@ public class OrderAdapter {
if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
if (orderBean.getDeliverStatus() == null) {
orderViewStatusDto.setOrderStatus(OrderStatus.RECEIPT.getCode());
orderViewStatusDto.setOrderStatusDesc("制作中");
orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
orderViewStatusDto.setOrderStatusDescText("请稍等片刻,美味即将到达哦~");
orderViewStatusDto.setRiderName("商家自配送");
orderViewStatusDto.setRiderText("正在为您匹配配送员");
......@@ -4047,4 +4047,17 @@ public class OrderAdapter {
return queryOrdersResponse;
}
/**
* 转换制作中的文案,美业用下单成功,其他用制作中
* @param orderBean
* @return
*/
public String conventProduceString(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