Merge branch 'master-chw-price' into dev-chw

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/RentVehicleBookDTO.java

@@ -160,6 +160,8 @@ public class RentVehicleBookDTO extends PageParam {
 
     @ApiModelProperty("城市")
     Integer addrCity;
+    @ApiModelProperty("排除城市")
+    Integer excludeCity;
     @ApiModelProperty("经度")
     Double lon;
     @ApiModelProperty("纬度")

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/UsableVeicleDTO.java

@@ -19,6 +19,8 @@ public class UsableVeicleDTO extends PageParam {
 
         @ApiModelProperty("城市")
         Integer addrCity;
+        @ApiModelProperty("排除城市")
+        Integer excludeCity;
         @ApiModelProperty("经度")
         Double lon;
         @ApiModelProperty("纬度")

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

@@ -245,6 +245,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         rbd.setLon(dto.getLon());
         rbd.setLat(dto.getLat());
         rbd.setAddrCity(dto.getAddrCity());
+        rbd.setExcludeCity(dto.getExcludeCity());
         rbd.setParkBranchCompanyId(dto.getStartCompanyId());
         rbd.setStartCompanyId(dto.getStartCompanyId());
         rbd.setEndCompanyId(dto.getEndCompanyId());

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

@@ -1251,12 +1251,17 @@
                     )
                 </if>
             </if>
+
             <if test=" modelId != null ">
                 and v.model_id = #{modelId}
             </if>
             <if test=" addrCity != null ">
                 and bc.addr_city = #{addrCity}
             </if>
+            <!-- 根据前后record 过滤车辆  -->
+            <if test="excludeCity != null ">
+                and bc.addr_city != #{excludeCity}
+            </if>
             <if test=" hotSign != null ">
                 and vm.hot_sign = #{hotSign}
             </if>
@@ -1463,8 +1468,8 @@
         </where>
         <choose>
             <when test="isMinPrice !=null and isMinPrice==1">
-                ORDER BY v.price ASC,v.create_time DESC
-            </when>
+            ORDER BY v.price ASC,v.create_time DESC
+        </when>
             <otherwise>
                 ORDER BY v.create_time DESC
             </otherwise>