Toggle navigation
Toggle navigation
This project
Loading...
Sign in
jiujian
/
client-customer-order-api
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
wang.shanshan
2025-12-22 10:28:26 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f61af1e313a2e65863e708f0722f9adb96eea859
f61af1e3
1 parent
d9fff53b
add today
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletions
src/main/java/com/infoloop/tianting/model/dto/MealOrderDTO.java
src/main/java/com/infoloop/tianting/service/impl/MealOrderServiceImpl.java
src/main/java/com/infoloop/tianting/model/dto/MealOrderDTO.java
View file @
f61af1e
...
...
@@ -21,6 +21,7 @@ public class MealOrderDTO {
@NotNull
(
message
=
"status不能为空"
)
private
QueryMealOrderStatusEnum
status
;
private
String
today
;
}
@Data
...
...
src/main/java/com/infoloop/tianting/service/impl/MealOrderServiceImpl.java
View file @
f61af1e
...
...
@@ -25,6 +25,7 @@ import java.time.DayOfWeek;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.time.LocalTime
;
import
java.time.ZoneId
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.Date
;
...
...
@@ -50,7 +51,13 @@ public class MealOrderServiceImpl implements MealOrderService {
public
List
<
MealOrderVO
>
queryMealOrders
(
MealOrderDTO
.
QueryMealOrderDTO
queryMealOrderDTO
)
{
final
var
loginInfo
=
LoginContextHolder
.
getLoginInfo
();
var
mealOrderRpcResponses
=
mealOrderServiceRpcClient
.
queryMealOrdersByCondition
(
loginInfo
.
getEnterpriseId
(),
List
.
of
(
loginInfo
.
getId
()),
null
,
null
);
final
var
today
=
LocalDate
.
now
();
LocalDate
today
=
LocalDate
.
now
();
if
(
queryMealOrderDTO
.
getToday
()
!=
null
)
{
final
var
todayDate
=
DateUtil
.
parseDate
(
queryMealOrderDTO
.
getToday
());
if
(
todayDate
!=
null
)
{
today
=
todayDate
.
toInstant
().
atZone
(
ZoneId
.
systemDefault
()).
toLocalDate
();
}
}
final
var
lastWeekStart
=
today
.
minusWeeks
(
1
).
with
(
DayOfWeek
.
MONDAY
).
atStartOfDay
().
atZone
(
DateUtil
.
CHINA_ZONE
).
toInstant
().
toEpochMilli
();
final
var
lastWeekEnd
=
today
.
minusWeeks
(
1
).
with
(
DayOfWeek
.
SUNDAY
).
atTime
(
LocalTime
.
MAX
).
atZone
(
DateUtil
.
CHINA_ZONE
).
toInstant
().
toEpochMilli
();
final
var
thisWeekStart
=
today
.
with
(
DayOfWeek
.
MONDAY
).
atStartOfDay
().
atZone
(
DateUtil
.
CHINA_ZONE
).
toInstant
().
toEpochMilli
();
...
...
Please
register
or
login
to post a comment