update: 正常流转的saas流转的三方配送单 不允许手工流转 除非已骑手取餐

order-management/src/main/java/cn/freemud/management/entities/dto/request/order/OrderManagerRequest.java

@@ -61,4 +61,5 @@ public class OrderManagerRequest {
     private String pickUpGoodsNo;
 
     private String remark;
+    private boolean horseman;
 }

order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java

@@ -124,7 +124,8 @@ public class OrderVerifyHandle {
         if (!OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())) {
             return ResponseUtil.error(ResponseResult.DELIVERY_SEND_STATUS_NOTAKE, getOrderManagerResponse(orderBean));
         }
-        if (!macCafePartnerId.equals(orderBean.getCompanyId()) && this.checkSaasWm(orderBean) && this.verifyThirdFlow(orderBean)) {
+        //三方配送正在进行，不允许操作送出  除非是骑手已经取餐
+        if (!macCafePartnerId.equals(orderBean.getCompanyId()) && this.checkSaasWm(orderBean) && this.verifyThirdFlow(orderBean,request)) {
             return ResponseUtil.error(ResponseResult.ORDER_MOVE_FAILED);
         }
         return ResponseUtil.success();
@@ -535,9 +536,10 @@ public class OrderVerifyHandle {
             return false;
         }
     }
-    private boolean verifyThirdFlow(QueryOrdersResponse.DataBean.OrderBean orderBean) {
+    private boolean verifyThirdFlow(QueryOrdersResponse.DataBean.OrderBean orderBean,OrderManagerRequest request) {
+        // 运单异常 运单取消  正常的运单是不允许手工操作流转的
         List<Integer> allow = Arrays.asList(DeliveryStatus.DELIVERYERROR.getCode(), DeliveryStatus.DELIVERYCANCEL.getCode());
-        if (!allow.contains(orderBean.getDeliverStatus())) {
+        if (!allow.contains(orderBean.getDeliverStatus()) && !request.getHorseman()) {
             return true;
         } else {
             return false;