Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
6088e6f4
Commit
6088e6f4
authored
May 07, 2020
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改租车文案
parent
d61a1269
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
OrderRentVehicleService.java
.../xxfc/platform/order/service/OrderRentVehicleService.java
+1
-4
RentVehicleController.java
...com/xxfc/platform/vehicle/rest/RentVehicleController.java
+1
-1
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java
View file @
6088e6f4
...
...
@@ -33,7 +33,6 @@ import com.xxfc.platform.universal.constant.DictionaryKey;
import
com.xxfc.platform.universal.feign.ThirdFeign
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
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.VehicleBookRecord
;
import
com.xxfc.platform.vehicle.entity.VehicleModel
;
...
...
@@ -55,7 +54,7 @@ import java.util.List;
import
java.util.Map
;
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_TRUE
;
import
static
com
.
xxfc
.
platform
.
order
.
contant
.
enumerate
.
ItemTypeEnum
.
ACCOMPANY
;
...
...
@@ -580,8 +579,6 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
rentVehicleBookDTO
.
setUseType
(
detail
.
getUseType
());
if
(
detail
.
getRentFreeDay
()
>
0
)
{
//使用了免费天数
rentVehicleBookDTO
.
setMemberUse
(
detail
.
getAppUserDTO
().
getMemberType
());
}
else
{
//不用免费天数
rentVehicleBookDTO
.
setMemberUse
(
VehicleMemberType
.
NO
.
getCode
());
}
if
(
detail
.
getAppUserDTO
()
!=
null
)
{
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java
View file @
6088e6f4
...
...
@@ -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
())))
{
throw
new
BaseException
(
ResultCode
.
NOTEXIST_CODE
,
new
HashSet
<
String
>(){{
add
(
"
该车不能使用会员免费天数
"
);
add
(
"
仅剩托管车辆,无法使用免费天数,请关闭会员特权
"
);
}});
}
bookVehicleId
=
pageDataVO
.
getData
().
get
(
0
).
getId
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment