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
230db194
Commit
230db194
authored
Nov 06, 2019
by
libin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
租车日历价格
parent
1f8665dd
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
69 additions
and
22 deletions
+69
-22
VehicleModelCalendarPriceBiz.java
...fc/platform/vehicle/biz/VehicleModelCalendarPriceBiz.java
+64
-18
VehicleModelCalendarPriceController.java
...orm/vehicle/rest/VehicleModelCalendarPriceController.java
+5
-4
No files found.
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelCalendarPriceBiz.java
View file @
230db194
This diff is collapsed.
Click to expand it.
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelCalendarPriceController.java
View file @
230db194
...
@@ -16,8 +16,9 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -16,8 +16,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.http.MediaType
;
import
org.springframework.http.MediaType
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.time.ZoneId
;
import
java.time.ZoneOffset
;
import
java.time.format.DateTimeFormatter
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
@@ -47,8 +48,8 @@ public class VehicleModelCalendarPriceController {
...
@@ -47,8 +48,8 @@ public class VehicleModelCalendarPriceController {
if
(
StringUtils
.
isEmpty
(
start
)
||
StringUtils
.
isEmpty
(
end
))
{
if
(
StringUtils
.
isEmpty
(
start
)
||
StringUtils
.
isEmpty
(
end
))
{
throw
new
BaseException
(
"缺少开始时间或结束时间"
);
throw
new
BaseException
(
"缺少开始时间或结束时间"
);
}
}
Date
startDate
=
Date
.
from
(
LocalDate
.
parse
(
start
).
atStartOfDay
(
ZoneId
.
systemDefault
()).
toInstant
(
));
Date
startDate
=
Date
.
from
(
LocalDate
Time
.
parse
(
start
,
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
)).
toInstant
(
ZoneOffset
.
ofHours
(
8
)
));
Date
endDate
=
Date
.
from
(
LocalDate
.
parse
(
end
).
atStartOfDay
(
ZoneId
.
systemDefault
()).
toInstant
(
));
Date
endDate
=
Date
.
from
(
LocalDate
Time
.
parse
(
end
,
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
)).
toInstant
(
ZoneOffset
.
ofHours
(
8
)
));
List
<
VehicleModelCalendarPriceDTO
>
vehicleModelCalendarPriceVos
=
vehicleModelCalendarPriceBiz
.
listVehicleModelCalendarPriceByDateAndVehicleModelIdAndUserId
(
startDate
,
endDate
,
vehicleModelId
,
appUserDTO
.
getUserid
());
List
<
VehicleModelCalendarPriceDTO
>
vehicleModelCalendarPriceVos
=
vehicleModelCalendarPriceBiz
.
listVehicleModelCalendarPriceByDateAndVehicleModelIdAndUserId
(
startDate
,
endDate
,
vehicleModelId
,
appUserDTO
.
getUserid
());
return
ObjectRestResponse
.
succ
(
vehicleModelCalendarPriceVos
);
return
ObjectRestResponse
.
succ
(
vehicleModelCalendarPriceVos
);
}
}
...
...
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