Merge remote-tracking branch 'origin/develop' into develop

project-order/src/main/java/com/dituhui/pea/order/service/impl/DispatchServiceImpl.java

@@ -373,8 +373,9 @@ public class DispatchServiceImpl implements DispatchService {
         if (CollectionUtils.isNotEmpty(errorList)) {
         if (CollectionUtils.isNotEmpty(errorList)) {
             String msg = errorList.size() > 3 ? String.join(",", errorList.subList(0, 3)) + "..." : String.join(",", errorList);
             String msg = errorList.size() > 3 ? String.join(",", errorList.subList(0, 3)) + "..." : String.join(",", errorList);
             resultList.add(String.format(StatusCodeEnum.ENGINEER_IS_LEAVE_TIME.getDesc(), msg, engineer.getName()));
             resultList.add(String.format(StatusCodeEnum.ENGINEER_IS_LEAVE_TIME.getDesc(), msg, engineer.getName()));
+            return Result.failed(CollectionUtils.isNotEmpty(resultList) ? String.join(",", resultList) : null);
         }
         }
-        return Result.success(CollectionUtils.isNotEmpty(resultList) ? String.join(",", resultList) : null);
+        return Result.success();
     }
     }
 
 
     @Override
     @Override

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderAssignImpl.java

@@ -310,7 +310,7 @@ public class OrderAssignImpl implements OrderAssign {
 
 
     private OrderInfoEntity handleMultipleOrders(OrderInfoEntity order) {
     private OrderInfoEntity handleMultipleOrders(OrderInfoEntity order) {
         //处理一家多单逻辑
         //处理一家多单逻辑
-        Result<String> deleteMultipleOrders = orderInfoService.deleteMultipleOrders(order.getMultipleOrders(), order.getAddressId());
+        Result<String> deleteMultipleOrders = orderInfoService.deleteMultipleOrders(order.getMultipleOrders(), order.getOrderId());
         if (!deleteMultipleOrders.getCode().equals(ResultEnum.SUCCESS.getCode())) {
         if (!deleteMultipleOrders.getCode().equals(ResultEnum.SUCCESS.getCode())) {
             throw new BusinessException("改约日期失败");
             throw new BusinessException("改约日期失败");
         }
         }

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderInfoServiceImpl.java

@@ -802,7 +802,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
 
 
     private OrderInfoEntity handleMultipleOrders(OrderInfoEntity order) {
     private OrderInfoEntity handleMultipleOrders(OrderInfoEntity order) {
         //处理一家多单逻辑
         //处理一家多单逻辑
-        Result<String> deleteMultipleOrders = this.deleteMultipleOrders(order.getMultipleOrders(), order.getAddressId());
+        Result<String> deleteMultipleOrders = this.deleteMultipleOrders(order.getMultipleOrders(), order.getOrderId());
         if (!deleteMultipleOrders.getCode().equals(ResultEnum.SUCCESS.getCode())) {
         if (!deleteMultipleOrders.getCode().equals(ResultEnum.SUCCESS.getCode())) {
             throw new BusinessException("改约日期失败");
             throw new BusinessException("改约日期失败");
         }
         }