Merge remote-tracking branch 'origin/master'

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRentVehicleController.java

@@ -74,7 +74,8 @@ public class OrderRentVehicleController extends CommonBaseController {
 
                 bo.setAppUserDTO(userFeign.userDetailById(dto.getAppUserId()).getData());
                 bo.setCrtUser("-1"+ BaseContextHandler.getUserID());
-                bo.setUseType(null);
+                //设置-1表示查询所有的车
+                bo.setUseType(-1);
                 orderRentVehicleService.createOrder(bo);
                 return ObjectRestResponse.succ(bo.getOrder());
         }

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -130,6 +130,9 @@
                 </foreach>
 
             </if>
+            <if test="userId != null">
+                and b.user_id = #{userId}
+            </if>
             <if test="status != null">
                 and b.status = #{status}
             </if>

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

@@ -1249,6 +1249,11 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     }
 
     public PageDataVO<Vehicle> searchUsableVehicle(RentVehicleBookDTO dto) {
+        //设置-1表示查询所有的车 由于null json序列化不会赋值过来
+        if(-1 == dto.getUseType()) {
+            dto.setUseType(null);
+        }
+
         Map<String, Object> params = BeanUtil.beanToMap(dto);
         List<String> notBookedDates = Lists.newArrayList();
         if (StringUtils.isNotBlank(dto.getBookEndDate()) &&

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

@@ -685,7 +685,6 @@
             <if test="useType != null">
                 and v.use_type = #{useType}
             </if>
-            and v.use_type = 1
             and bc.is_del = 0
             and bc.is_show = 1
         </where>