Merge branch 'master-vehicle-price' into dev-tiande

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java

@@ -173,14 +173,24 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
                         //判断是否预定时间内可租
                         usableVeicleVO.setAllowRent(SYS_TRUE);
                         //如果"必须在这时间后预定" 存在 并且 比预定开始时间 要晚，那么不允许预定
-                        if(null != usableVeicleVO.getToLiftMustAfterDate() && DateUtil.date(dto.getStartDateTamp()).isBeforeOrEquals(usableVeicleVO.getToLiftMustAfterDate())) {
+                        if(null != usableVeicleVO.getToLiftMustAfterDate() ) {
+                            //取结束End
+                            usableVeicleVO.setToLiftMustAfterDate(DateUtil.endOfDay(usableVeicleVO.getToLiftMustAfterDate()));
+
+                            if(DateUtil.date(dto.getStartDateTamp()).isBeforeOrEquals(usableVeicleVO.getToLiftMustAfterDate())) {
                                 usableVeicleVO.setAllowRent(SYS_FALSE);
                             }
+                        }
 
                         //如果"必须在这时间前预定" 存在 并且 比预定结束时间 要早，那么不允许预定
-                        if(null != usableVeicleVO.getToReturnMustBeforeDate() && DateUtil.date(dto.getEndDateTamp()).isAfterOrEquals(usableVeicleVO.getToReturnMustBeforeDate())) {
+                        if(null != usableVeicleVO.getToReturnMustBeforeDate() ) {
+                            //取开始 begin
+                            usableVeicleVO.setToReturnMustBeforeDate(DateUtil.beginOfDay(usableVeicleVO.getToReturnMustBeforeDate()));
+
+                            if(DateUtil.date(dto.getEndDateTamp()).isAfterOrEquals(usableVeicleVO.getToReturnMustBeforeDate())) {
                                 usableVeicleVO.setAllowRent(SYS_FALSE);
                             }
+                        }
 
                         String priceStartDateStr = StrUtil.isNotBlank(dto.getPriceStartDate())? dto.getPriceStartDate(): dto.getStartDate();
                         String priceEndDateStr = StrUtil.isNotBlank(dto.getPriceEndDate())? dto.getPriceEndDate(): dto.getEndDate();

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

@@ -1184,7 +1184,15 @@
             <!-- 若需根据预定日期条件查询，针对换为位操作  -->
                 <!-- yearNo4Where 标识时间参数是否用于where条件 -->
             <if test=" yearMonthAndParam !=null and yearMonthAndParam != null and yearNo4Where == null">
-                vbi.bit_str = #{yearMonthAndParamBitStr}
+                and vbi.bit_str = #{yearMonthAndParamBitStr}
+            </if>
+
+            <if test=" yearNo4Where != null and recordIntersection != null and recordIntersection == true">
+                <!-- 1、最后还车时间(天) 大于 最早提车时间(天)  并且多于一天-->
+                and if((abr.to_lift_must_after_date == null or abr.to_return_must_before_date == null), true
+                    , (str_to_date(DATE_FORMAT(abr.to_return_must_before_date,'%Y-%m-%d'),'%Y-%m-%d %H:%i:%s')
+                        >  DATE_ADD(DATE_ADD(str_to_date(DATE_FORMAT(abr.to_lift_must_after_date,'%Y-%m-%d'),'%Y-%m-%d %H:%i:%s'),INTERVAL 2 DAY),INTERVAL -1 SECOND))
+                )
             </if>
 
             <!-- 根据前后record 过滤车辆  -->