Commit d2e9408b by 胡敬轩

Merge remote-tracking branch 'remotes/origin/feature/20210927-v2048-拒绝退款文案展示'

parents 401cf1ca 5f4937a5
......@@ -1794,6 +1794,10 @@ public class OrderAdapter {
if (refundBean != null && RefundStatus.ALREADY_REFUND.getCode().equals(refundBean.getStatus())) {
setAgreeRefundDesc(orderViewStatusDto, orderBean);
}
//拒绝退款
if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
}
}
if (OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())) {
if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
......@@ -1818,6 +1822,10 @@ public class OrderAdapter {
if (refundBean != null && RefundStatus.ALREADY_REFUND.getCode().equals(refundBean.getStatus())) {
setAgreeRefundDesc(orderViewStatusDto, orderBean);
}
//拒绝退款
if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
}
}
if (OrderStatus.COMPLETE_MAKE.getCode().equals(orderBean.getStatus())) {
if (refundBean == null) {
......@@ -1841,6 +1849,10 @@ public class OrderAdapter {
if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
setAgreeRefundDesc(orderViewStatusDto, orderBean);
}
//拒绝退款
if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
}
}
}
if (OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
......@@ -1924,6 +1936,10 @@ public class OrderAdapter {
if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
setAgreeRefundDesc(orderViewStatusDto, orderBean);
}
//拒绝退款
if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
}
}
if (OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())) {
if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
......@@ -1955,6 +1971,10 @@ public class OrderAdapter {
if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
setAgreeRefundDesc(orderViewStatusDto, orderBean);
}
//拒绝退款
if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
}
}
if (OrderStatus.COMPLETE_MAKE.getCode().equals(orderBean.getStatus())) {
if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
......@@ -1983,6 +2003,10 @@ public class OrderAdapter {
if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
setAgreeRefundDesc(orderViewStatusDto, orderBean);
}
//拒绝退款
if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
}
}
//TODO 判断配送中的逻辑 如果是有第三方配送,要查询第三方配送信息,显示骑手信息 如果有骑手信息 显示 联系骑手
if (OrderStatus.DISTRIBUTION.getCode().equals(orderBean.getStatus())) {
......@@ -2067,6 +2091,10 @@ public class OrderAdapter {
orderViewStatusDto.setButtonRefund(false);
orderViewStatusDto.setRefundStatusText("商家会处理退款申请,请稍后");
//拒绝退款
if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
}
} else {
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
}
......
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