Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
shop
Project
Project
Details
Activity
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
曲欣亮
shop
Commits
d2ae2d23
Commit
d2ae2d23
authored
Feb 28, 2023
by
张永
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
229dde85
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
OrderServiceImpl.java
...ava/com/egolm/shop/api/service/impl/OrderServiceImpl.java
+3
-3
No files found.
src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java
View file @
d2ae2d23
...
@@ -988,12 +988,12 @@ public class OrderServiceImpl implements OrderService {
...
@@ -988,12 +988,12 @@ public class OrderServiceImpl implements OrderService {
}
}
});
});
Integer
start
=
page
.
getFirstRowNumber
().
intValue
()
-
1
;
/*
Integer start = page.getFirstRowNumber().intValue() - 1;
Integer end = page.getLastRowNumber().intValue();
Integer end = page.getLastRowNumber().intValue();
Integer size = sortList.size();
Integer size = sortList.size();
end = size < end ? size : end;
end = size < end ? size : end;
page.setTotal((long)sortList.size());
page.setTotal((long)sortList.size());
List
<
Map
<
String
,
Object
>>
datas
=
sortList
.
subList
(
start
,
end
);
List<Map<String, Object>> datas = sortList.subList(start, end);
*/
if
(
orderList
!=
null
&&
orderList
.
size
()
>
0
)
{
if
(
orderList
!=
null
&&
orderList
.
size
()
>
0
)
{
List
<
String
>
orderIdList
=
orderList
.
stream
().
map
(
o
->
(
String
)
o
.
get
(
"SubOrderID"
)).
collect
(
Collectors
.
toList
());
List
<
String
>
orderIdList
=
orderList
.
stream
().
map
(
o
->
(
String
)
o
.
get
(
"SubOrderID"
)).
collect
(
Collectors
.
toList
());
...
@@ -1034,7 +1034,7 @@ public class OrderServiceImpl implements OrderService {
...
@@ -1034,7 +1034,7 @@ public class OrderServiceImpl implements OrderService {
}
}
Map
<
String
,
Object
>
result
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
result
=
new
HashMap
<
String
,
Object
>();
result
.
put
(
"page"
,
page
);
result
.
put
(
"page"
,
page
);
result
.
put
(
"SalesOrderList"
,
datas
);
result
.
put
(
"SalesOrderList"
,
orderList
);
return
new
RespObject
(
result
);
return
new
RespObject
(
result
);
}
}
...
...
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