Commit 6088e6f4 authored by jiaorz's avatar jiaorz

修改租车文案

parent d61a1269
...@@ -33,7 +33,6 @@ import com.xxfc.platform.universal.constant.DictionaryKey; ...@@ -33,7 +33,6 @@ import com.xxfc.platform.universal.constant.DictionaryKey;
import com.xxfc.platform.universal.feign.ThirdFeign; import com.xxfc.platform.universal.feign.ThirdFeign;
import com.xxfc.platform.vehicle.common.RestResponse; import com.xxfc.platform.vehicle.common.RestResponse;
import com.xxfc.platform.vehicle.constant.AccompanyingItemType; import com.xxfc.platform.vehicle.constant.AccompanyingItemType;
import com.xxfc.platform.vehicle.constant.VehicleMemberType;
import com.xxfc.platform.vehicle.entity.BranchCompany; import com.xxfc.platform.vehicle.entity.BranchCompany;
import com.xxfc.platform.vehicle.entity.VehicleBookRecord; import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
import com.xxfc.platform.vehicle.entity.VehicleModel; import com.xxfc.platform.vehicle.entity.VehicleModel;
...@@ -55,7 +54,7 @@ import java.util.List; ...@@ -55,7 +54,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.github.wxiaoqi.security.admin.constant.enumerate.MemberEnum.*; import static com.github.wxiaoqi.security.admin.constant.enumerate.MemberEnum.NONE;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE; import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE; import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
import static com.xxfc.platform.order.contant.enumerate.ItemTypeEnum.ACCOMPANY; import static com.xxfc.platform.order.contant.enumerate.ItemTypeEnum.ACCOMPANY;
...@@ -580,8 +579,6 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl ...@@ -580,8 +579,6 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
rentVehicleBookDTO.setUseType(detail.getUseType()); rentVehicleBookDTO.setUseType(detail.getUseType());
if (detail.getRentFreeDay() > 0) {//使用了免费天数 if (detail.getRentFreeDay() > 0) {//使用了免费天数
rentVehicleBookDTO.setMemberUse(detail.getAppUserDTO().getMemberType()); rentVehicleBookDTO.setMemberUse(detail.getAppUserDTO().getMemberType());
} else { //不用免费天数
rentVehicleBookDTO.setMemberUse(VehicleMemberType.NO.getCode());
} }
if (detail.getAppUserDTO() != null) { if (detail.getAppUserDTO() != null) {
......
...@@ -196,7 +196,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements ...@@ -196,7 +196,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
}}); }});
} else if (pageDataVO.getData().size() <= 0 && (dto.getMemberUse() == null ||!dto.getMemberUse().equals(VehicleMemberType.NO.getCode()))) { } else if (pageDataVO.getData().size() <= 0 && (dto.getMemberUse() == null ||!dto.getMemberUse().equals(VehicleMemberType.NO.getCode()))) {
throw new BaseException(ResultCode.NOTEXIST_CODE, new HashSet<String>(){{ throw new BaseException(ResultCode.NOTEXIST_CODE, new HashSet<String>(){{
add("该车不能使用会员免费天数"); add("仅剩托管车辆,无法使用免费天数,请关闭会员特权");
}}); }});
} }
bookVehicleId = pageDataVO.getData().get(0).getId(); bookVehicleId = pageDataVO.getData().get(0).getId();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment