Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-store
Overview
Overview
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
base_platform_enterprise
gic-store
Commits
8a15369a
Commit
8a15369a
authored
Apr 30, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
2c4aa533
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
7 deletions
+10
-7
ClerkApiServiceImpl.java
...com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
+10
-7
No files found.
gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
View file @
8a15369a
...
...
@@ -274,12 +274,16 @@ public class ClerkApiServiceImpl implements ClerkApiService {
}
private
String
getStoreIdByStoreInfoIds
(
List
<
Integer
>
storeInfoIdsBySearch
,
String
search
)
{
StoreSearchDBDTO
storeSearchDBDTO
=
new
StoreSearchDBDTO
();
storeSearchDBDTO
.
setStoreInfoIdList
(
storeInfoIdsBySearch
);
storeSearchDBDTO
.
setSearch
(
search
);
List
<
StoreDTO
>
dtos
=
storeService
.
listStore
(
storeSearchDBDTO
,
1
,
Integer
.
MAX_VALUE
);
return
Optional
.
ofNullable
(
dtos
).
orElse
(
Collections
.
emptyList
()).
stream
().
map
(
e
->
e
.
getStoreId
().
toString
())
.
reduce
((
x
,
y
)
->
x
+
" "
+
y
).
orElse
(
""
);
StoreSearchDTO
storeSearchDTO
=
new
StoreSearchDTO
();
storeSearchDTO
.
setStoreInfoIds
(
StringUtils
.
join
(
storeInfoIdsBySearch
,
" "
));
storeSearchDTO
.
setSearch
(
search
);
Page
<
StoreDTO
>
page
=
storeApiService
.
listStore
(
storeSearchDTO
,
1
,
Integer
.
MAX_VALUE
).
getResult
();
if
(
page
==
null
)
{
return
""
;
}
else
{
return
Optional
.
ofNullable
(
page
.
getResult
()).
orElse
(
Collections
.
emptyList
()).
stream
().
map
(
e
->
e
.
getStoreId
().
toString
())
.
reduce
((
x
,
y
)
->
x
+
" "
+
y
).
orElse
(
""
);
}
}
@SuppressWarnings
(
"unchecked"
)
...
...
@@ -290,7 +294,6 @@ public class ClerkApiServiceImpl implements ClerkApiService {
storeSearchDTO
.
setStoreGroupId
(
clerkSearchDTO
.
getStoreGroupId
());
storeSearchDTO
.
setSearchJson
(
clerkSearchDTO
.
getSelectJson
());
storeSearchDTO
.
setStoreIds
(
clerkSearchDTO
.
getStoreIds
());
// storeSearchDTO.setSearch(clerkSearchDTO.getSearch());
return
storeApiService
.
listStore
(
storeSearchDTO
,
pageNum
,
pageSize
,
"storeId,storeName,storeCode,storeInfoId,ownType"
);
...
...
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