Merge branch 'master' of http://113.105.137.151:22280/youjj/cloud-platform

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

@@ -59,7 +59,7 @@ public class VehicleActiveService {
      * @param departureVo
      */
     public void departure(VehicleDepartureVo departureVo) {
-        try {
+        log.info("出车参数： departureVo = {}", departureVo.toString());
         Vehicle vehicle = vehicleMapper.selectByPrimaryKey(departureVo.getVehicleId());
         if (vehicle == null) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
@@ -69,7 +69,7 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getDesc(),
                     ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getCode());
         }
-            if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
+        if (vehicle.getStatus().equals(VehicleStatus.DISCARD.getCode()) || vehicle.getIsDel() == 1) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
         }
@@ -90,11 +90,6 @@ public class VehicleActiveService {
             // 修改车辆状态，确认是空闲状态
             int result = vehicleMapper.updateStatusByIdAndStatus(departureVo.getVehicleId(), VehicleStatus.DEPARTURE.getCode(),
                     VehicleStatus.NORMAL.getCode());
-
-                if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
-                    throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
-                            ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
-                }
             //修改预约记录状态
             VehicleBookRecord vehicleBookRecord = null;
             if (departureVo.getBookRecordId() != null) {
@@ -134,8 +129,6 @@ public class VehicleActiveService {
                 }
                 vehicleDepartureLogMapper.insert(departureLog);
             }
-
-
             // 车辆活动日志
             VehicleActiveLog activeLog = new VehicleActiveLog();
             activeLog.setVehicleId(departureVo.getVehicleId());
@@ -147,10 +140,6 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
     }
 
 
@@ -192,7 +181,6 @@ public class VehicleActiveService {
     }
 
     public void arrival(VehicleArrivalVo arrivalVo) {
-        try {
         Vehicle vehicle = vehicleMapper.selectByPrimaryKey(arrivalVo.getVehicleId());
         if (vehicle == null) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
@@ -319,9 +307,6 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
     }
 
     //添加出车时间过滤 再出车开始时间前一天至结束时间内可以出车,并且预定记录为已审核状态
@@ -331,15 +316,13 @@ public class VehicleActiveService {
             if (vehicleBookRecord != null) {
                 DateTime startDate = new DateTime(vehicleBookRecord.getBookStartDate());
                 DateTime endDate = new DateTime(vehicleBookRecord.getBookEndDate());
-                Map<String, Object> param = new HashMap<>();
-                param.put("vehicleId", vehicleBookRecord.getVehicleId());
-                param.put("bookedEndDate", vehicleBookRecord.getBookStartDate());
-                List<VehicleBookRecordVo> list = vehicleBookRecordBiz.selectByVehicleIdAndTime(param);
+                List<VehicleBookRecordVo> list = vehicleBookRecordBiz.selectByVehicleId(vehicleBookRecord.getVehicleId());
                 if (list != null && list.size() > 0) {
                     Iterator<VehicleBookRecordVo> iterator = list.iterator();
                     while (iterator.hasNext()) {
                         VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-                        if (vehicleBookRecordVo.getVehicleDepartureLogVo() == null && vehicleBookRecordVo.getBookEndDate().getTime() - new Date().getTime() < 0) {
+                        //未出车且超过出车时间和已出车的和本条记录过滤，剩下为正常未出车记录
+                        if ((arrivalVo.getBookRecordId() == vehicleBookRecordVo.getId()) || (vehicleBookRecordVo.getVehicleDepartureLogVo() == null && vehicleBookRecordVo.getBookEndDate().getTime() - new Date().getTime() < 0) || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null)) {
                             iterator.remove();
                         }
                     }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -327,7 +327,7 @@
 
     <select id="selectByVehicleIdAndTime" parameterType="java.util.Map" resultMap="searchBookRecord">
         select v1.* from vehicle_book_record v1
-         where v1.vehicle_id = #{vehicleId}   and v1.book_end_date &lt;= #{bookedEndDate} and v1.status BETWEEN 1 and 2
+         where v1.vehicle_id = #{vehicleId} and v1.status BETWEEN 1 and 2
     </select>
 
     <select id="selectZeroHourRecord" resultMap="searchBookRecord" parameterType="java.util.Map">