修改代码

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

@@ -1173,17 +1173,19 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     public PageDataVO<UsableVehicleModelVO> searchUsableModel(UsableVeicleDTO dto) {
         Map<String, Object> params = BeanUtil.beanToMap(dto);
         if (StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) {
-            initBookSearchParam(dto, params, Boolean.FALSE);
+            params = initBookSearchParam(dto, params, Boolean.FALSE);
         }
-        return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
+        Map<String, Object> finalParams = params;
+        return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(finalParams));
     }
 
     public PageDataVO<UsableVehicleModelVO> searchUsableModelBackStage(UsableVeicleDTO dto) {
         Map<String, Object> params = BeanUtil.beanToMap(dto);
         if (StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) {
-            initBookSearchParam(dto, params, Boolean.FALSE);
+            params = initBookSearchParam(dto, params, Boolean.FALSE);
         }
-        return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
+        Map<String, Object> finalParams = params;
+        return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(finalParams));
     }
 
     public PageDataVO<UsableVehicleModelVO> hotModel(HotVeicleDTO dto) {
@@ -1192,7 +1194,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
     }
 
-    private void initBookSearchParam(UsableVeicleDTO dto, Map<String, Object> params, Boolean needDateExtend) {
+    private Map<String, Object> initBookSearchParam(UsableVeicleDTO dto, Map<String, Object> params, Boolean needDateExtend) {
         List<String> notBookedDates = Lists.newArrayList();
         if (StringUtils.isNotBlank(dto.getStartDate()) &&
                 StringUtils.isNotBlank(dto.getEndDate())) {
@@ -1204,6 +1206,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                     dto.getEndDate());
                 dto.setStartDateExtend(dto.getStartDate());
                 dto.setEndDateExtend(dto.getEndDate());
+                params = BeanUtil.beanToMap(dto);
             }
         }
 
@@ -1223,6 +1226,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
 
         //加入预定信息查询条件
         fillBookedDateSearchParam(params, yearMonthAndDate, yearMonthAndDateNotBooked);
+        return params;
     }
 
     public PageDataVO<Vehicle> searchUsableVehicle(RentVehicleBookDTO dto) {
@@ -1231,7 +1235,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             dto.setUseType(null);
         }
 
-        Map<String, Object> params = BeanUtil.beanToMap(dto);
         List<String> notBookedDates = Lists.newArrayList();
         if (StringUtils.isNotBlank(dto.getBookEndDate()) &&
                 StringUtils.isNotBlank(dto.getBookEndDate())) {
@@ -1239,10 +1242,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                     dto.getBookEndDate());
             dto.setStartDateExtend(dto.getBookStartDate());
             dto.setEndDateExtend(dto.getBookEndDate());
+
 //            notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
 //                    dto.getEndDateExtend());
         }
 
+        Map<String, Object> params = BeanUtil.beanToMap(dto);
+
         //若传入预定信息查询条件，则查询对应月份预定信息查询条件（不超过3个月）
         if (CollectionUtils.isEmpty(notBookedDates)) {
             //return;