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

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -97,10 +97,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
     public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd");
 
     public List<OrderVehicleCrosstownDto> selectByOrderId(OrderVehicleCrosstownDto orderVehicleCrosstownDto) throws BaseException{
-        UserDTO byAppUser = getBusinessUserByAppUser();
-        if (byAppUser == null ) {
-           throw new BaseException(ResultCode.RSTOKEN_EXPIRED_CODE);
-        }
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getTypes())) {
             String[] types = orderVehicleCrosstownDto.getTypes().split(",");
             orderVehicleCrosstownDto.setTypeList(Lists.newArrayList(types));

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

@@ -205,7 +205,7 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
-        if (MileageRest != null && MileageRest1 >= MileageRest) {
+        if (MileageRest == null || MileageRest1 >= MileageRest) {
             VehicleBookRecord vehicleBookRecord = null;
             if (arrivalVo.getBookRecordId() != null) {
                 vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());