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

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

@@ -164,7 +164,7 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 
 		//Date currentDate = DateUtil.beginOfDay(DateUtil.parse(startDate));
 		for(cn.hutool.core.date.DateTime currentDate = DateUtil.beginOfDay(DateUtil.parse(startDate));
-			(currentDate.isAfterOrEquals(beginOfStartDate) || currentDate.isBeforeOrEquals(endOfStartDate));
+			(currentDate.isAfterOrEquals(beginOfStartDate) && currentDate.isBeforeOrEquals(endOfStartDate));
 			currentDate = DateUtil.offsetDay(currentDate, 1)) {
 			cn.hutool.core.date.DateTime finalCurrentDate = currentDate;
 			VehicleModelCalendarPriceDTO dto = new VehicleModelCalendarPriceDTO(){{

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/config/WebConfiguration.java

@@ -74,7 +74,8 @@ public class WebConfiguration implements WebMvcConfigurer {
                 "/branchCompany/**",
                 "/vehicleModel/**",
                 "/departure/**",
-                "/company/**"
+                "/company/**",
+                "/vehicleHolidayPriceInfo/**"
         };
         Collections.addAll(list, urls);
         return list;

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

@@ -864,7 +864,7 @@
 
     <select id="searchUsableModel" parameterType="java.util.Map"
             resultMap="searchUsableModelMap">
-        (select distinct vm.id as model_id, bc.id as company_id, group_concat(v.id) vehicle_ids
+        (select distinct vm.id as model_id, bc.id as company_id, group_concat(v.id) as vehicle_ids
         <if test=" catas != null ">
             ,GROUP_CONCAT(vc.cata_id) as catas
         </if>
@@ -911,31 +911,32 @@
         </if>
         )
         <!-- union 所有下架车型 -->
-        <if test="startCompanyId != null or parkBranchCompanyId != null ">
-            union
-            (select vm.id as model_id, bc.id as company_id
-            <if test=" catas != null ">
-                ,null as catas
-            </if>
-            <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">
-                ,0 as hasVehicle
-            </if>
-            <if test="lon != null and lat != null">
-                <!-- 处理距离 -->
-                ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
-            </if>
-            from vehicle_model vm
-                left join branch_company bc on
-                <choose>
-                    <when test="startCompanyId != null">
-                        bc.id = #{startCompanyId}
-                    </when>
-                    <otherwise>
-                        bc.id = #{parkBranchCompanyId}
-                    </otherwise>
-                </choose>
-            where vm.isdel = 0 and vm.status = 0 and vm.app_show = 1)
-        </if>
+<!--        -->
+<!--        <if test="startCompanyId != null or parkBranchCompanyId != null ">-->
+<!--            union-->
+<!--            (select vm.id as model_id, bc.id as company_id-->
+<!--            <if test=" catas != null ">-->
+<!--                ,null as catas-->
+<!--            </if>-->
+<!--            <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">-->
+<!--                ,0 as hasVehicle-->
+<!--            </if>-->
+<!--            <if test="lon != null and lat != null">-->
+<!--                &lt;!&ndash; 处理距离 &ndash;&gt;-->
+<!--                ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance-->
+<!--            </if>-->
+<!--            from vehicle_model vm-->
+<!--                left join branch_company bc on-->
+<!--                <choose>-->
+<!--                    <when test="startCompanyId != null">-->
+<!--                        bc.id = #{startCompanyId}-->
+<!--                    </when>-->
+<!--                    <otherwise>-->
+<!--                        bc.id = #{parkBranchCompanyId}-->
+<!--                    </otherwise>-->
+<!--                </choose>-->
+<!--            where vm.isdel = 0 and vm.status = 0 and vm.app_show = 1)-->
+<!--        </if>-->
         <if test="lon != null and lat != null">
             order by
             <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">