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
a7f7b28e
Commit
a7f7b28e
authored
Oct 29, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改天数计算方式
parent
1df770f4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
OrderCalculateBiz.java
.../com/xxfc/platform/order/biz/inner/OrderCalculateBiz.java
+1
-1
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/biz/inner/OrderCalculateBiz.java
View file @
a7f7b28e
...
@@ -246,7 +246,7 @@ public class OrderCalculateBiz {
...
@@ -246,7 +246,7 @@ public class OrderCalculateBiz {
bookDays
+=
1
;
bookDays
+=
1
;
}
}
if
(
(
0
==
bookDays
)
&&
(
bookTimeLag
>
0
)
)
{
if
(
0
==
bookDays
)
{
bookDays
=
1
;
bookDays
=
1
;
}
}
return
bookDays
;
return
bookDays
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java
View file @
a7f7b28e
...
@@ -195,7 +195,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
...
@@ -195,7 +195,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
}
}
bookVehicleId
=
pageDataVO
.
getData
().
get
(
0
).
getId
();
bookVehicleId
=
pageDataVO
.
getData
().
get
(
0
).
getId
();
}
}
//判断是否为今天,如果是则设置为
一分钟后开始
//判断是否为今天,如果是则设置为
30秒后开始 防止预约开始时间比当前时间 要 前
if
(
DateUtil
.
today
().
equals
(
dto
.
getBookStartDate
()))
{
if
(
DateUtil
.
today
().
equals
(
dto
.
getBookStartDate
()))
{
LocalDateTime
ldt
=
LocalDateTime
.
ofInstant
(
Instant
.
ofEpochMilli
(
System
.
currentTimeMillis
()),
ZoneOffset
.
ofHours
(
8
)).
plusSeconds
(
30L
);
LocalDateTime
ldt
=
LocalDateTime
.
ofInstant
(
Instant
.
ofEpochMilli
(
System
.
currentTimeMillis
()),
ZoneOffset
.
ofHours
(
8
)).
plusSeconds
(
30L
);
dto
.
setBookStartDate
(
DateTimeFormatter
.
ofPattern
(
DATE_TIME_LINE
).
format
(
ldt
));
dto
.
setBookStartDate
(
DateTimeFormatter
.
ofPattern
(
DATE_TIME_LINE
).
format
(
ldt
));
...
...
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