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

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

@@ -38,6 +38,7 @@ import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 
@@ -166,7 +167,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
                 //查询可车辆信息
                 PageDataVO<UsableVeicleVO> pageDataVO = vehicleBiz.searchUsableVehicle(rbd);
                 if(CollUtil.isNotEmpty(pageDataVO.getData())) {
-
+                    data.setHasVehicle(SYS_TRUE);
                     for (UsableVeicleVO usableVeicleVO : pageDataVO.getData()) {
 
                         //判断是否预定时间内可租
@@ -179,8 +180,6 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
                         //如果"必须在这时间前预定" 存在 并且 比预定结束时间 要早，那么不允许预定
                         if(null != usableVeicleVO.getToReturnMustBeforeDate() && DateUtil.date(dto.getEndDateTamp()).isAfterOrEquals(usableVeicleVO.getToReturnMustBeforeDate())) {
                             usableVeicleVO.setAllowRent(SYS_FALSE);
-                        }else {
-                            data.setHasVehicle(SYS_TRUE);
                         }
 
                         String priceStartDateStr = StrUtil.isNotBlank(dto.getPriceStartDate())? dto.getPriceStartDate(): dto.getStartDate();
@@ -191,6 +190,8 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
                     data.setUsableVeicleVOList(pageDataVO.getData());
                 }
             });
+            //车型排序
+            //uvmvpdvs.getData().parallelStream().sorted(Comparator.comparing(UsableVehicleModelVO::getHasVehicle).reversed());
         }
         return ObjectRestResponse.succ(uvmvpdvs);
     }

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

@@ -1025,21 +1025,29 @@
             ,GROUP_CONCAT(vc.cata_id) as catas
         </if>
         <!-- yearNo4Where 标识时间参数不用于where条件，用于select部分 -->
-        <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">
-            ,(max(
-                ifnull(vbi.bit_str = #{yearMonthAndParamBitStr}, false)
-                <!-- 租车列表 不过滤前后预约记录不符的车辆 但是合并标示车型是否有车 即 hasVehicle-->
-                <if test="withoutRecordWhere != null and withoutRecordWhere = 1 and startCompanyId != null and endCompanyId != null ">
-<!--                    and (abr.to_lift_company is null or abr.to_lift_company = #{startCompanyId})-->
-<!--                    and (abr.to_return_company is null or abr.to_return_company = #{endCompanyId})-->
-                    and (
-                    (IFNULL(abr.to_lift_company, v.park_branch_company_id) = #{startCompanyId})
-                    and
-                    (abr.to_return_company is null or abr.to_return_company = #{endCompanyId})
+        <if test=" yearMonthAndParam !=null  ">
+            ,
+            <if test="yearNo4Where != null and yearNo4Where == true">
+                (max(
+                    ifnull(vbi.bit_str = #{yearMonthAndParamBitStr}, false)
+                    <!-- 租车列表 不过滤前后预约记录不符的车辆 但是合并标示车型是否有车 即 hasVehicle-->
+                    <if test="withoutRecordWhere != null and withoutRecordWhere = 1 and startCompanyId != null and endCompanyId != null ">
+                        <!--                    and (abr.to_lift_company is null or abr.to_lift_company = #{startCompanyId})-->
+                        <!--                    and (abr.to_return_company is null or abr.to_return_company = #{endCompanyId})-->
+                        and (
+                        (IFNULL(abr.to_lift_company, v.park_branch_company_id) = #{startCompanyId})
+                        and
+                        (abr.to_return_company is null or abr.to_return_company = #{endCompanyId})
+                        )
+                    </if>
                     )
-                </if>
                 )
-            ) as hasVehicle
+            </if>
+            <if test="yearNo4Where != null and yearNo4Where == true">
+                (if(count(*) > 1, 1 , 0))
+            </if>
+
+            as hasVehicle
         </if>
         <if test="lon != null and lat != null">
             ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance