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
zhuyifan
2025-10-29 18:07:47 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
586060375201e97b4c13a3f1ee479652ccde1c5e
58606037
1 parent
da982433
refactor(settlement):优化订单查询逻辑
- 移除了今日开始时间戳的计算逻辑- 简化了订单时间过滤条件 - 提高了代码可读性和维护性
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
16 deletions
src/main/java/com/infoloop/tianting/service/impl/SettlementServiceImpl.java
src/main/java/com/infoloop/tianting/service/impl/SettlementServiceImpl.java
View file @
5860603
...
...
@@ -63,7 +63,6 @@ import java.math.BigDecimal;
import
java.math.RoundingMode
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.time.ZoneId
;
import
java.time.temporal.ChronoUnit
;
import
java.util.ArrayList
;
import
java.util.Collections
;
...
...
@@ -1139,21 +1138,8 @@ public class SettlementServiceImpl implements SettlementService {
// 查询订单列表
final
var
queryClientCustomerOrdersByConditionRpcResponse
=
orderServiceRpcClient
.
queryClientCustomerOrdersByCondition
(
queryOrderDto
);
// 今天开始时间的时间戳(毫秒)
final
long
todayStartTimestamp
=
LocalDate
.
now
().
atStartOfDay
()
.
atZone
(
ZoneId
.
systemDefault
())
.
toInstant
()
.
toEpochMilli
();
final
var
orderList
=
queryClientCustomerOrdersByConditionRpcResponse
.
getResponsesList
()
.
stream
()
.
filter
(
e
->
{
boolean
payStatusMatch
=
e
.
getPayStatus
()
==
PayStatusEnum
.
SUCCEED
||
e
.
getPayStatus
()
==
PayStatusEnum
.
PAY_CANCELED
;
// 过滤时间:只查询今天和以后的订单
boolean
timeMatch
=
e
.
getMealTime
()
>=
todayStartTimestamp
;
return
payStatusMatch
&&
timeMatch
;
})
.
toList
();
final
var
orderList
=
queryClientCustomerOrdersByConditionRpcResponse
.
getResponsesList
();
if
(
orderList
.
isEmpty
())
{
log
.
warn
(
"未查询到订单数据,enterpriseId: {}"
,
enterpriseId
);
return
createEmptyExcelBySeparateMeal
();
...
...
Please
register
or
login
to post a comment