包租车牌登记

src/main/java/com/qmrb/system/service/impl/ContractPlaceNumberRelServiceImpl.java

@@ -376,7 +376,7 @@ public class ContractPlaceNumberRelServiceImpl extends ServiceImpl<ContractPlace
 
     @Override
     public List<ContractPlaceNumberRel> initContractRelByVirtual(Long contractId, LocalDateTime currentDate) {
-        List<VirtualParkingSlot> list = virtualParkingSlotService.list(new LambdaQueryWrapper<VirtualParkingSlot>().eq(VirtualParkingSlot::getContractId, contractId).orderByAsc(VirtualParkingSlot::getId));
+        List<VirtualParkingSlot> list = virtualParkingSlotService.list(new LambdaQueryWrapper<VirtualParkingSlot>().eq(VirtualParkingSlot::getContractId, contractId).in(VirtualParkingSlot::getStatus,"0","1").orderByAsc(VirtualParkingSlot::getId));
         if(CollectionUtil.isEmpty(list)){
             return null;
         }

src/main/java/com/qmrb/system/service/impl/VirtualParkingSlotServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.qmrb.system.common.result.Result;
@@ -278,8 +279,9 @@ public class VirtualParkingSlotServiceImpl extends ServiceImpl<VirtualParkingSlo
 		if(StrUtil.equals(plateNumber,virtualParkingSlot.getCurrentPlateNumber()) && lastReleasedTime != null ){
 			// 获取n-2天零时零分零秒
 			Date beforeYesterday = DateUtils.getStartOfDay(DateUtil.offset(currentDate, DateField.DAY_OF_MONTH, -2));
-			
-			if(lastReleasedTime.after(beforeYesterday)){
+
+			Long betweenDay = DateUtil.between(beforeYesterday, lastReleasedTime, DateUnit.DAY);
+			if(betweenDay != null && betweenDay > 0 && betweenDay <= 2){
 				lastOccupiedTime = virtualParkingSlot.getLastReleasedTime();//2025-04-17 14:00:00
 			}else{
 				lastOccupiedTime = currentDate;