Commit 6451ddd8 by shuhu.hou@freemud.cn

忽略门店商户校验,兼容爱马哥

parent f2324e84
...@@ -64,7 +64,7 @@ public class OrderVerifyHandle { ...@@ -64,7 +64,7 @@ public class OrderVerifyHandle {
if (!OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) { if (!OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
return ResponseUtil.error(ResponseResult.ORDER_CANNOT_CONFIRM, getOrderManagerResponse(orderBean)); return ResponseUtil.error(ResponseResult.ORDER_CANNOT_CONFIRM, getOrderManagerResponse(orderBean));
} }
return commonVerify(orderBean, request); return ResponseUtil.success();
} }
/** /**
...@@ -97,7 +97,7 @@ public class OrderVerifyHandle { ...@@ -97,7 +97,7 @@ public class OrderVerifyHandle {
if (!OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())) { if (!OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())) {
return ResponseUtil.error(ResponseResult.DELIVERY_SEND_STATUS_NOTAKE, getOrderManagerResponse(orderBean)); return ResponseUtil.error(ResponseResult.DELIVERY_SEND_STATUS_NOTAKE, getOrderManagerResponse(orderBean));
} }
return commonVerify(orderBean, request); return ResponseUtil.success();
} }
...@@ -160,7 +160,7 @@ public class OrderVerifyHandle { ...@@ -160,7 +160,7 @@ public class OrderVerifyHandle {
if (isWaimai(orderBean) && ObjectUtils.notEqual(OrderStatus.DISTRIBUTION.getCode(), orderBean.getStatus())) { if (isWaimai(orderBean) && ObjectUtils.notEqual(OrderStatus.DISTRIBUTION.getCode(), orderBean.getStatus())) {
return ResponseUtil.error(ResponseResult.ORDER_DELIVERY_FAILED, getOrderManagerResponse(orderBean)); return ResponseUtil.error(ResponseResult.ORDER_DELIVERY_FAILED, getOrderManagerResponse(orderBean));
} }
return commonVerify(orderBean, request); return ResponseUtil.success();
} }
/** /**
...@@ -194,7 +194,7 @@ public class OrderVerifyHandle { ...@@ -194,7 +194,7 @@ public class OrderVerifyHandle {
if (!OrderStatus.TAKE_ORDER.getCode().equals(status)) { if (!OrderStatus.TAKE_ORDER.getCode().equals(status)) {
return ResponseUtil.error(ResponseResult.REJECT_FAIL_ORDER_IS_NOT_NEW, getOrderManagerResponse(orderBean)); return ResponseUtil.error(ResponseResult.REJECT_FAIL_ORDER_IS_NOT_NEW, getOrderManagerResponse(orderBean));
} }
return commonVerify(orderBean, request); return ResponseUtil.success();
} }
/** /**
...@@ -226,7 +226,7 @@ public class OrderVerifyHandle { ...@@ -226,7 +226,7 @@ public class OrderVerifyHandle {
if (isCanRefund) { if (isCanRefund) {
orderBean.setAmount(getRefundAmount(orderBean).longValue()); orderBean.setAmount(getRefundAmount(orderBean).longValue());
} }
return commonVerify(orderBean, request); return ResponseUtil.success();
} }
/** /**
...@@ -255,7 +255,7 @@ public class OrderVerifyHandle { ...@@ -255,7 +255,7 @@ public class OrderVerifyHandle {
|| OrderStatus.CANCEL.getCode().equals(orderBean.getStatus()))) { || OrderStatus.CANCEL.getCode().equals(orderBean.getStatus()))) {
return ResponseUtil.error(ResponseResult.ORDER_REJECT_REFUND_STATUS_END); return ResponseUtil.error(ResponseResult.ORDER_REJECT_REFUND_STATUS_END);
} }
return commonVerify(orderBean, request); return ResponseUtil.success();
} }
/** /**
......
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