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

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderTourVerificationBiz.java

@@ -94,12 +94,12 @@ public class OrderTourVerificationBiz{
 
         // 出发时间 是否已经发车
         Date departureDate = tourFeign.selectDepartureDataBySpeId(tourDetail.getSpePriceId());
-        Long departureTime = tourFeign.selectDepartureTimeByStartCompanyIdAndRouteId(tourDetail.getStartCompanyId(), tourDetail.getGoodId());
+        //Long departureTime = tourFeign.selectDepartureTimeByStartCompanyIdAndRouteId(tourDetail.getStartCompanyId(), tourDetail.getGoodId());
         Integer departureStatus = tourFeign.selectDepartureStatusByVerificationId(verificationId);
-        LocalTime localDepartureTime = LocalTime.ofSecondOfDay(departureTime);
-        departureDate.setHours(localDepartureTime.getHour());
-        departureDate.setMinutes(localDepartureTime.getMinute());
-        departureDate.setSeconds(localDepartureTime.getSecond());
+        //LocalTime localDepartureTime = LocalTime.ofSecondOfDay(departureTime);
+        departureDate.setHours(0);
+        departureDate.setMinutes(0);
+        departureDate.setSeconds(0);
 
         if (Instant.now().toEpochMilli()<departureDate.toInstant().toEpochMilli()){
             return ObjectRestResponse.createFailedResultWithObj(400,"还未到发车时间",0);