取消车型 装卸车时间限制

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -111,15 +111,15 @@ public class OrderChildServiceImpl implements OrderChildService {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_INVALID);
         }
 
-        // 车型限制
-        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderGoods.getOrderNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        if (StringUtils.isNotBlank(orderInfo.getTruckModelList())){
-            List<JSONObject> truckModelList = JSON.parseArray(orderInfo.getTruckModelList(), JSONObject.class);
-            List<String> truckModelNameList = truckModelList.stream().map(item -> item.getString("truckModelName")).collect(Collectors.toList());
-            if (!truckModelNameList.contains(driverTruckInfo.getModel())){
-                throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_TRUCK_MODEL_ERROR);
-            }
-        }
+//        // 车型限制
+//        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderGoods.getOrderNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+//        if (StringUtils.isNotBlank(orderInfo.getTruckModelList())){
+//            List<JSONObject> truckModelList = JSON.parseArray(orderInfo.getTruckModelList(), JSONObject.class);
+//            List<String> truckModelNameList = truckModelList.stream().map(item -> item.getString("truckModelName")).collect(Collectors.toList());
+//            if (!truckModelNameList.contains(driverTruckInfo.getModel())){
+//                throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_TRUCK_MODEL_ERROR);
+//            }
+//        }
 
         // 定向
         OrderGoodsTruckBind orderGoodsTruckBind = orderGoodsTruckBindDao.getValidByOrderGoodsNoAndTruckNo(truckNo).orNull();
@@ -383,14 +383,14 @@ public class OrderChildServiceImpl implements OrderChildService {
     private void updateLoadFirst(OrderChildLoadParam param, OrderChild orderChild, OrderGoods orderGoods) {
         String childNo = param.getChildNo();
 
-        // 装车时间验证
-        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderChild.getOrderNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        LocalDateTime now = LocalDateTime.now();
-        LocalDateTime beginTime = DateUtils.parseDateTime(DateUtils.formatDateTime(now, "yyyy-MM-dd ").get() + orderInfo.getLoadBeginTime()).get();
-        LocalDateTime endTime = DateUtils.parseDateTime(DateUtils.formatDateTime(now, "yyyy-MM-dd ").get() + orderInfo.getLoadEndTime()).get();
-        if (now.isBefore(beginTime) || now.isAfter(endTime)){
-            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_TIME_ERROR);
-        }
+//        // 装车时间验证
+//        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderChild.getOrderNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+//        LocalDateTime now = LocalDateTime.now();
+//        LocalDateTime beginTime = DateUtils.parseDateTime(DateUtils.formatDateTime(now, "yyyy-MM-dd ").get() + orderInfo.getLoadBeginTime()).get();
+//        LocalDateTime endTime = DateUtils.parseDateTime(DateUtils.formatDateTime(now, "yyyy-MM-dd ").get() + orderInfo.getLoadEndTime()).get();
+//        if (now.isBefore(beginTime) || now.isAfter(endTime)){
+//            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_TIME_ERROR);
+//        }
 
         List<OrderChildImage> imageList = new ArrayList<>();
         for (String item : param.getLoadImageList()) {
@@ -491,14 +491,14 @@ public class OrderChildServiceImpl implements OrderChildService {
     private void updateUnloadFirst(OrderChildUnloadParam param, OrderChild orderChild) {
         String childNo = param.getChildNo();
 
-        // 装车时间验证
-        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderChild.getOrderNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        LocalDateTime now = LocalDateTime.now();
-        LocalDateTime beginTime = DateUtils.parseDateTime(DateUtils.formatDateTime(now, "yyyy-MM-dd ").get() + orderInfo.getUnloadBeginTime()).get();
-        LocalDateTime endTime = DateUtils.parseDateTime(DateUtils.formatDateTime(now, "yyyy-MM-dd ").get() + orderInfo.getUnloadEndTime()).get();
-        if (now.isBefore(beginTime) || now.isAfter(endTime)){
-            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_UNLOAD_TIME_ERROR);
-        }
+//        // 装车时间验证
+//        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderChild.getOrderNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+//        LocalDateTime now = LocalDateTime.now();
+//        LocalDateTime beginTime = DateUtils.parseDateTime(DateUtils.formatDateTime(now, "yyyy-MM-dd ").get() + orderInfo.getUnloadBeginTime()).get();
+//        LocalDateTime endTime = DateUtils.parseDateTime(DateUtils.formatDateTime(now, "yyyy-MM-dd ").get() + orderInfo.getUnloadEndTime()).get();
+//        if (now.isBefore(beginTime) || now.isAfter(endTime)){
+//            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_UNLOAD_TIME_ERROR);
+//        }
 
         List<OrderChildImage> imageList = new ArrayList<>();
         for (String item : param.getUnloadImageList()) {