Commit 20377bac by xiaoer.li

Merge remote-tracking branch 'remotes/origin/feature/1.9.22_C端订单状态描述' into qa

parents 8d571ec1 a658d016
...@@ -1530,7 +1530,7 @@ public class OrderAdapter { ...@@ -1530,7 +1530,7 @@ public class OrderAdapter {
// TODO: 2019/9/9 获取商户退款配置 // TODO: 2019/9/9 获取商户退款配置
if (refundBean != null && refundBean.getStatus() != null) { if (refundBean != null && refundBean.getStatus() != null) {
orderViewStatusDto.setButtonRefund(false); orderViewStatusDto.setButtonRefund(false);
orderViewStatusDto.setRefundStatusText("正在退款中,请稍等"); orderViewStatusDto.setRefundStatusText("正在退款中,稍后金额会原路退回");
} else { } else {
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId)); orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
...@@ -1941,7 +1941,7 @@ public class OrderAdapter { ...@@ -1941,7 +1941,7 @@ public class OrderAdapter {
orderViewStatusDto.setOrderStatus(orderBean.getStatus()); orderViewStatusDto.setOrderStatus(orderBean.getStatus());
orderViewStatusDto.setOrderStatusDesc("退款中"); orderViewStatusDto.setOrderStatusDesc("退款中");
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任,期待再次光临~"); orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任,期待再次光临~");
orderViewStatusDto.setRefundStatusText("正在退款中,请稍等"); orderViewStatusDto.setRefundStatusText("正在退款中,稍后金额会原路退回");
orderViewStatusDto.setButtonContactPartner(true); orderViewStatusDto.setButtonContactPartner(true);
} }
//同意 //同意
...@@ -1949,7 +1949,7 @@ public class OrderAdapter { ...@@ -1949,7 +1949,7 @@ public class OrderAdapter {
orderViewStatusDto.setOrderStatus(orderBean.getStatus()); orderViewStatusDto.setOrderStatus(orderBean.getStatus());
orderViewStatusDto.setOrderStatusDesc("退款中"); orderViewStatusDto.setOrderStatusDesc("退款中");
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任,期待再次光临~"); orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任,期待再次光临~");
orderViewStatusDto.setRefundStatusText("正在退款中,请稍等"); orderViewStatusDto.setRefundStatusText("正在退款中,稍后金额会原路退回");
orderViewStatusDto.setButtonContactPartner(true); orderViewStatusDto.setButtonContactPartner(true);
} }
......
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