Skip to content

O
order-group
Commit 88b1b7a4 by ping.wu
Options

部分退，退款完成可继续扭转订单状态

parent f2333a34
Showing with 3 additions and 6 deletions
order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
...@@ -124,8 +124,7 @@ public class OrderVerifyHandle { ...@@ -124,8 +124,7 @@ public class OrderVerifyHandle {
if (checkRefund(orderBean) if (checkRefund(orderBean)
&& orderBean.getHasRefund() != null && orderBean.getHasRefund() != null
&& orderBean.getHasRefund() && orderBean.getHasRefund()
&& (orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 1 && orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 1) {
|| orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 4)) {
return ResponseUtil.error(ResponseResult.DELIVERY_SEND_APPLY_REFUND, getOrderManagerResponse(orderBean)); return ResponseUtil.error(ResponseResult.DELIVERY_SEND_APPLY_REFUND, getOrderManagerResponse(orderBean));
} }
//外卖订单不是接单不能送出 //外卖订单不是接单不能送出
...@@ -162,8 +161,7 @@ public class OrderVerifyHandle { ...@@ -162,8 +161,7 @@ public class OrderVerifyHandle {
//判断订单状态是否为已经申请退款订单 //判断订单状态是否为已经申请退款订单
if (orderBean.getHasRefund() != null if (orderBean.getHasRefund() != null
&& orderBean.getHasRefund() && orderBean.getHasRefund()
&& (orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 1 && orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 1) {
|| orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 4)) {
return ResponseUtil.error(ResponseResult.DONE_FAIL_APPLY_REFUND, getOrderManagerResponse(orderBean)); return ResponseUtil.error(ResponseResult.DONE_FAIL_APPLY_REFUND, getOrderManagerResponse(orderBean));
} }
if (this.checkSaasWm(orderBean) && this.verifyThirdFlow(orderBean,request)) { if (this.checkSaasWm(orderBean) && this.verifyThirdFlow(orderBean,request)) {
...@@ -194,8 +192,7 @@ public class OrderVerifyHandle { ...@@ -194,8 +192,7 @@ public class OrderVerifyHandle {
//判断订单状态是否为已经申请退款订单 //判断订单状态是否为已经申请退款订单
if (checkRefund(orderBean)&&orderBean.getHasRefund() != null if (checkRefund(orderBean)&&orderBean.getHasRefund() != null
&& orderBean.getHasRefund() && orderBean.getHasRefund()
&& (orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 1 && orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 1) {
|| orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 4)) {
return ResponseUtil.error(ResponseResult.AFFIRM_FAIL_APPLY_REFUND, getOrderManagerResponse(orderBean)); return ResponseUtil.error(ResponseResult.AFFIRM_FAIL_APPLY_REFUND, getOrderManagerResponse(orderBean));
} }
//校验订单是否为配送状态 //校验订单是否为配送状态
......
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