Skip to content

O
order-group
Commit 66f4b05e by xiaoer.li@freemud.com
Options

fix

parent 9c9be615
Showing with 5 additions and 4 deletions
order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
...@@ -125,7 +125,7 @@ public class OrderVerifyHandle { ...@@ -125,7 +125,7 @@ public class OrderVerifyHandle {
return ResponseUtil.error(ResponseResult.DELIVERY_SEND_STATUS_NOTAKE, getOrderManagerResponse(orderBean)); return ResponseUtil.error(ResponseResult.DELIVERY_SEND_STATUS_NOTAKE, getOrderManagerResponse(orderBean));
} }
//三方配送正在进行，不允许操作送出 除非是骑手已经取餐 //三方配送正在进行，不允许操作送出 除非是骑手已经取餐
if (!macCafePartnerId.equals(orderBean.getCompanyId()) && this.checkSaasWm(orderBean) && this.verifyThirdFlow(orderBean,request.getHorseman())) { if (!macCafePartnerId.equals(orderBean.getCompanyId()) && this.checkSaasWm(orderBean) && this.verifyThirdFlow(orderBean,request)) {
return ResponseUtil.error(ResponseResult.ORDER_MOVE_FAILED); return ResponseUtil.error(ResponseResult.ORDER_MOVE_FAILED);
} }
return ResponseUtil.success(); return ResponseUtil.success();
...@@ -158,7 +158,7 @@ public class OrderVerifyHandle { ...@@ -158,7 +158,7 @@ public class OrderVerifyHandle {
|| orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 4)) { || 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.getHorseman())) { if (this.checkSaasWm(orderBean) && this.verifyThirdFlow(orderBean,request)) {
return ResponseUtil.error(ResponseResult.ORDER_MOVE_FAILED); return ResponseUtil.error(ResponseResult.ORDER_MOVE_FAILED);
} }
return ResponseUtil.success(); return ResponseUtil.success();
...@@ -195,7 +195,7 @@ public class OrderVerifyHandle { ...@@ -195,7 +195,7 @@ public class OrderVerifyHandle {
return ResponseUtil.error(ResponseResult.ORDER_DELIVERY_FAILED, getOrderManagerResponse(orderBean)); return ResponseUtil.error(ResponseResult.ORDER_DELIVERY_FAILED, getOrderManagerResponse(orderBean));
} }
//三方配送正在进行，不允许操作送出 除非是骑手已经取餐 //三方配送正在进行，不允许操作送出 除非是骑手已经取餐
if (!macCafePartnerId.equals(orderBean.getCompanyId()) && this.checkSaasWm(orderBean) && this.verifyThirdFlow(orderBean,request.getHorseman())) { if (!macCafePartnerId.equals(orderBean.getCompanyId()) && this.checkSaasWm(orderBean) && this.verifyThirdFlow(orderBean,request)) {
return ResponseUtil.error(ResponseResult.ORDER_MOVE_FAILED); return ResponseUtil.error(ResponseResult.ORDER_MOVE_FAILED);
} }
return ResponseUtil.success(); return ResponseUtil.success();
...@@ -540,8 +540,9 @@ public class OrderVerifyHandle { ...@@ -540,8 +540,9 @@ public class OrderVerifyHandle {
return false; return false;
} }
} }
private boolean verifyThirdFlow(QueryOrdersResponse.DataBean.OrderBean orderBean,Boolean horseman) { private boolean verifyThirdFlow(QueryOrdersResponse.DataBean.OrderBean orderBean,OrderManagerRequest request) {
// 运单异常 运单取消 正常的运单是不允许手工操作流转的 // 运单异常 运单取消 正常的运单是不允许手工操作流转的
Boolean horseman = request.getHorseman()!=null ? request.getHorseman():false;
List<Integer> allow = Arrays.asList(DeliveryStatus.DELIVERYERROR.getCode(), DeliveryStatus.DELIVERYCANCEL.getCode()); List<Integer> allow = Arrays.asList(DeliveryStatus.DELIVERYERROR.getCode(), DeliveryStatus.DELIVERYCANCEL.getCode());
if (!allow.contains(orderBean.getDeliverStatus()) && !horseman) { if (!allow.contains(orderBean.getDeliverStatus()) && !horseman) {
return true; return true;
......
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