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
95130b5d
Commit
95130b5d
authored
Aug 14, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改租车bug
parent
0c365595
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
AppUserController.java
...github/wxiaoqi/security/admin/rest/AppUserController.java
+1
-1
BaseOrderBiz.java
...c/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
+1
-0
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java
View file @
95130b5d
...
@@ -153,7 +153,7 @@ public class AppUserController extends CommonBaseController{
...
@@ -153,7 +153,7 @@ public class AppUserController extends CommonBaseController{
UserMemberVo
memberVo
=
userMemberBiz
.
getMemberInfoByUserId
(
userid
);
UserMemberVo
memberVo
=
userMemberBiz
.
getMemberInfoByUserId
(
userid
);
if
(
memberVo
!=
null
){
if
(
memberVo
!=
null
){
BeanUtils
.
copyProperties
(
userDTO
,
memberVo
);
BeanUtils
.
copyProperties
(
userDTO
,
memberVo
);
userDTO
.
setPayCount
(
orderFeign
.
baseOrderCount
(
SYS_TRUE
,
"4,5,6,
7
"
,
null
,
userid
).
getData
());
userDTO
.
setPayCount
(
orderFeign
.
baseOrderCount
(
SYS_TRUE
,
"4,5,6,
-1
"
,
null
,
userid
).
getData
());
Integer
level
=
memberVo
.
getMemberLevel
();
Integer
level
=
memberVo
.
getMemberLevel
();
BaseUserMemberLevel
memberLevel
=
userMemberLevelBiz
.
getLevel
(
level
);
BaseUserMemberLevel
memberLevel
=
userMemberLevelBiz
.
getLevel
(
level
);
if
(
memberLevel
!=
null
){
if
(
memberLevel
!=
null
){
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
View file @
95130b5d
...
@@ -322,6 +322,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
...
@@ -322,6 +322,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
setOrderId
(
baseOrder
.
getId
());
setOrderId
(
baseOrder
.
getId
());
}});
}});
//车辆预定审核通过
//车辆预定审核通过
vehicleFeign
.
proveVehicleBooking
(
orvd
.
getBookRecordId
());
//确认免费天数
//确认免费天数
if
(
orvd
.
getFreeDays
()
>
0
)
{
if
(
orvd
.
getFreeDays
()
>
0
)
{
...
...
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