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

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

@@ -21,7 +21,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class VehicleActiveService {
@@ -288,12 +290,18 @@ public class VehicleActiveService {
                 DateTime startDate = new DateTime(vehicleBookRecord.getBookStartDate());
                 DateTime endDate = new DateTime(vehicleBookRecord.getBookEndDate());
                 if(!(startDate.minusDays(1).compareTo(DateTime.now()) <= 0 && DateTime.now().compareTo(endDate) <= 0 && vehicleBookRecord.getStatus() == VehicleBookRecordStatus.APPROVE.getCode())) {
+                    Map<String, Object> param = new HashMap<>();
+                    param.put("vehicleId", vehicleBookRecord.getVehicleId());
+                    param.put("time", vehicleBookRecord.getBookStartDate());
+                    List<VehicleBookRecord> list = vehicleBookRecordBiz.selectByVehicleIdAndTime(param);
+                    if(list != null && list.size() > 0) {
                         throw new BaseException(ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getDesc(),
                                 ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getCode());
                     }
                 }
             }
         }
+    }
 
 
     public void updateBookRecordStatus(VehicleBookRecord vehicleBookRecord, Integer type) {

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

@@ -525,7 +525,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             vehicleBookHourInfoDto.setVehicleId(vehicleId);
             List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
             if(vehicleBookHourInfos != null && vehicleBookHourInfos.size() >0) {
-                if((vehicleBookHourInfos.get(0).getBookedHour() & entry.getValue()) == entry.getValue()) { // 已经被预定
+                if((vehicleBookHourInfos.get(0).getBookedHour() & entry.getValue()) != 0) { // 已经被预定
                     log.info(entry.getKey() + "预定的时间段已经被预约！");
                     return Boolean.FALSE;
                 }

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

@@ -147,8 +147,8 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     }
 
     public static void main(String[] args) throws Exception{
-        int b = 16744448;
-        Integer a = b | 48;
+        int b = 24;
+        Integer a = b & 4;
         System.out.println(a);
     }
 

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

@@ -87,6 +87,10 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         insertSelectiveRe(vehicleBookRecord);
     }
 
+    public List<VehicleBookRecord> selectByVehicleIdAndTime(Map<String, Object> param) {
+        return mapper.selectByVehicleIdAndTime(param);
+    }
+
     public int changeRecordStatus(Map<String, Object> updateParam) {
         return mapper.changeRecordStatus(updateParam);
     }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleBookRecordMapper.java

@@ -35,4 +35,6 @@ public interface VehicleBookRecordMapper extends Mapper<VehicleBookRecord> {
     public List<VehicleBookRecordVo> getBookRecord(VehicleBookRecordQueryVo vehicleBookRecordQueryVo);
 
     public List<VehicleBookRecordVo> getBookRecordInfo(Map<String, Object> param);
+
+    public List<VehicleBookRecord> selectByVehicleIdAndTime(Map<String, Object> param);
 }
\ No newline at end of file

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

@@ -325,6 +325,11 @@
         order by vbr.id desc
     </select>
 
+    <select id="selectByVehicleIdAndTime" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.VehicleBookRecord">
+        select v1.* from vehicle_book_record v1
+         where v1.vehicle_id = #{vehicleId} and v1.status BETWEEN 1 and 2 and v1.book_end_date >= #{time}
+    </select>
+
     <select id="getById" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.VehicleBookRecord">
         select
             vbr.`id`,