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
8b61d5c7
Commit
8b61d5c7
authored
Nov 11, 2019
by
周健威
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'holiday-price' into dev
parents
cf7d929e
4492f271
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
VehicleItemDTO.java
...va/com/xxfc/platform/order/pojo/order/VehicleItemDTO.java
+1
-1
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/VehicleItemDTO.java
View file @
8b61d5c7
...
@@ -145,7 +145,7 @@ public class VehicleItemDTO extends OrderItem {
...
@@ -145,7 +145,7 @@ public class VehicleItemDTO extends OrderItem {
public
Integer
mapFreeDays
(
Integer
userDays
)
{
public
Integer
mapFreeDays
(
Integer
userDays
)
{
List
<
VMCalendarPriceCostDTO
>
vmcpds
=
getVehicleDetail
();
List
<
VMCalendarPriceCostDTO
>
vmcpds
=
getVehicleDetail
();
if
(
userDays
<
getTotalNum
())
{
if
(
userDays
>
getTotalNum
())
{
userDays
=
getTotalNum
();
userDays
=
getTotalNum
();
}
}
if
(
CollUtil
.
isEmpty
(
vmcpds
)){
if
(
CollUtil
.
isEmpty
(
vmcpds
)){
...
...
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