Commit 9d338258 by ping.wu

拒绝退款判断修改

parent 6fe2a90c
...@@ -447,16 +447,14 @@ public class OrderVerifyHandle { ...@@ -447,16 +447,14 @@ public class OrderVerifyHandle {
*/ */
public BaseResponse orderRejectRefund(OrderBeanV1 orderBean, OrderManagerRequest request) { public BaseResponse orderRejectRefund(OrderBeanV1 orderBean, OrderManagerRequest request) {
//判断当前订单是否发起退款 //判断当前订单是否发起退款
if (orderBean.getHasRefund() == null || !orderBean.getHasRefund()) { if (orderBean.getHasRefund() == null || !orderBean.getHasRefund() || orderBean.getAfterSalesOrderResp() == null) {
return ResponseUtil.error(ResponseResult.ORDER_REFUND_NOT_APPLY); return ResponseUtil.error(ResponseResult.ORDER_REFUND_NOT_APPLY);
} }
//判断该当前订单是否已经退款 if (ObjectUtils.equals(AfterSalesStatus.COMPLETE.getIndex(), orderBean.getAfterSalesOrderResp().getAfterSalesStatus())) {
List<RefundBeanV1> list = orderBean.getRefundList();
if (ObjectUtils.equals(list.get(list.size() - 1).getStatus(), 5)) {
return ResponseUtil.error(ResponseResult.ORDER_REJECT_REFUND_REPETITION); return ResponseUtil.error(ResponseResult.ORDER_REJECT_REFUND_REPETITION);
} }
//订单不是申请退款中,不能操作 //订单不是申请退款中,不能操作
if (ObjectUtils.notEqual(list.get(list.size() - 1).getStatus(), 1)) { if (ObjectUtils.notEqual(AfterSalesStatus.PENDING.getIndex(), orderBean.getAfterSalesOrderResp().getAfterSalesStatus())) {
return ResponseUtil.error(ResponseResult.ORDER_REJECT_REFUND_STATUS_NOT); return ResponseUtil.error(ResponseResult.ORDER_REJECT_REFUND_STATUS_NOT);
} }
//新订单,已完成,取消订单不能操作 //新订单,已完成,取消订单不能操作
......
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