Merge remote-tracking branch 'remotes/origin/feature/2.0.16-小程序外卖配送逻辑调整' into develop

order-application-service/src/main/java/cn/freemud/entities/dto/pos/PosBaseRequestDto.java

@@ -45,5 +45,5 @@ public class PosBaseRequestDto {
 
     private Integer delivery_status;
     private String deliveryId;
-    private boolean horseman = false;
+    private Boolean horseman = false;
 }

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

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

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

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

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderManagerRequest.java

@@ -40,7 +40,7 @@ public class OrderManagerRequest {
      */
     private String operator;
 
-    private boolean horseman;
+    private Boolean horseman;
     public OrderManagerRequest(){
 
     }