Commit e1d58b2b by 王世昌

外卖单售后流程优化

parent 505c396e
......@@ -121,7 +121,8 @@ public class OrderVerifyHandle {
return ResponseUtil.error(ResponseResult.DELIVERY_SEND_REPETITION, getOrderManagerResponse(orderBean));
}
//判断订单状态是否为已经申请退款订单
if (orderBean.getHasRefund() != null
if (checkRefund(orderBean)
&& orderBean.getHasRefund() != null
&& orderBean.getHasRefund()
&& (orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 1
|| orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 4)) {
......@@ -191,7 +192,7 @@ public class OrderVerifyHandle {
return ResponseUtil.error(ResponseResult.ORDER_HAS_CANCELED, getOrderManagerResponse(orderBean));
}
//判断订单状态是否为已经申请退款订单
if (orderBean.getHasRefund() != null
if (checkRefund(orderBean)&&orderBean.getHasRefund() != null
&& orderBean.getHasRefund()
&& (orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 1
|| orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 4)) {
......@@ -208,6 +209,23 @@ public class OrderVerifyHandle {
return ResponseUtil.success();
}
private static boolean checkRefund(QueryOrdersResponse.DataBean.OrderBean orderBean) {
List<String> uncheckRefund = Arrays.asList(
OrderSourceType.ELEME.getCode(),
OrderSourceType.EBAI.getCode(),
OrderSourceType.MTWM.getCode(),
OrderSourceType.BDWM.getCode(),
OrderSourceType.JUBAOPEN.getCode(),
OrderSourceType.DIANPING.getCode(),
OrderSourceType.KOUBEI.getCode()
);
// 非三方渠道, 且是外卖类型三方配送的订单,不再进行售后单的判断,否则配送无法进行流转
return !Objects.equals(OldOrderType.TAKE_OUT.getCode(), orderBean.getType())
|| !(!uncheckRefund.contains(orderBean.getSource())
&& Objects.nonNull(orderBean.getAddInfo())
&& THIRD.equalsIgnoreCase(orderBean.getAddInfo().getDeliveryType()));
}
/**
* 拒单
*
......
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