Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
order-center-tool-2
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
陈文明
order-center-tool-2
Commits
76462236
Commit
76462236
authored
Jul 10, 2025
by
年畅
🛀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
449af70a
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
398 additions
and
231 deletions
+398
-231
ListSellerConst.java
...a/com/zm/order/tool/server/constants/ListSellerConst.java
+389
-225
OrderRoutingServiceImpl.java
.../server/service/impl/routing/OrderRoutingServiceImpl.java
+9
-6
No files found.
src/main/java/com/zm/order/tool/server/constants/ListSellerConst.java
View file @
76462236
This diff is collapsed.
Click to expand it.
src/main/java/com/zm/order/tool/server/service/impl/routing/OrderRoutingServiceImpl.java
View file @
76462236
...
...
@@ -681,7 +681,7 @@ public class OrderRoutingServiceImpl implements OrderRoutingService, Initializin
logger
.
info
(
"orderConvert,convert_order_last_id_1:{}, count:{}, i:{}, j:{}, sellerId:{}"
,
lastId
,
count
,
i
,
j
,
sellerId
);
Result
<
String
>
redisData
=
redisManager
.
get
(
"convert_order_shut_down_key_4
4
"
);
Result
<
String
>
redisData
=
redisManager
.
get
(
"convert_order_shut_down_key_4
5
"
);
if
(
redisData
.
isStatus
()
&&
Objects
.
nonNull
(
redisData
.
getData
()))
{
logger
.
info
(
"[orderConvert]shut down!"
);
return
;
...
...
@@ -1144,11 +1144,11 @@ public class OrderRoutingServiceImpl implements OrderRoutingService, Initializin
long
s
=
System
.
currentTimeMillis
();
List
<
Order
>
converted
=
new
ArrayList
<>(
orderList
.
size
());
List
<
Order
>
orders1
=
filterAt
(
orderList
);
if
(
CollectionUtils
.
isEmpty
(
orders1
))
{
return
;
}
order
s1
.
forEach
(
each
->
{
//
List<Order> orders1 = filterAt(orderList);
//
if (CollectionUtils.isEmpty(orders1)) {
//
return;
//
}
order
List
.
forEach
(
each
->
{
// 枚举值
Order
newOrder
=
(
Order
)
orderStreamConverter
.
streamIn
(
each
);
converted
.
add
(
newOrder
);
...
...
@@ -1348,6 +1348,9 @@ public class OrderRoutingServiceImpl implements OrderRoutingService, Initializin
query
.
setSize
(
2000
);
query
.
setOrderNoList
(
converted
.
stream
().
map
(
Order:
:
getOrderNo
).
collect
(
Collectors
.
toList
()));
List
<
OrderPayDetails
>
payDetailsList
=
commonManager
.
scanPayDetailsList
(
query
,
i
,
j
);
if
(
CollectionUtils
.
isEmpty
(
payDetailsList
))
{
return
;
}
Map
<
String
,
List
<
Order
>>
orderMap
=
converted
.
stream
().
collect
(
Collectors
.
groupingBy
(
Order:
:
getOrderNo
));
List
<
OrderPayDetails
>
payConverted
=
new
ArrayList
<>(
converted
.
size
());
...
...
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