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
13c9a261
Commit
13c9a261
authored
Jul 22, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
导购
parent
f88133eb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
18 deletions
+18
-18
ClerkApiServiceImpl.java
...com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
+18
-18
No files found.
gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
View file @
13c9a261
...
...
@@ -292,24 +292,24 @@ public class ClerkApiServiceImpl implements ClerkApiService {
}
}
// 分组的id
List
<
TabStoreGroup
>
groupList
=
storeGroupService
.
listStoreGroupAndChildren
(
clerkSearchDTO
.
getStoreGroupId
());
List
<
Integer
>
groupIds
=
groupList
.
stream
().
map
(
TabStoreGroup:
:
getStoreGroupId
).
collect
(
Collectors
.
toList
());
// 查询条件对应的storeId
String
storeIdByClerkSearch
;
if
(
StringUtils
.
isNotBlank
(
clerkSearchDTO
.
getSearch
()))
{
List
<
Integer
>
storeInfoIdsBySearch
=
clerkService
.
getStoreInfoIdsBySearch
(
enterpriseId
,
clerkSearchDTO
.
getSearch
());
if
(
CollectionUtils
.
isEmpty
(
groupIds
)
||
CollectionUtils
.
isEmpty
(
storeInfoIdsBySearch
))
{
return
ServiceResponse
.
success
(
new
Page
<>());
}
else
{
storeIdByClerkSearch
=
getStoreIdByStoreInfoIds
(
storeInfoIdsBySearch
,
null
);
}
}
else
{
storeIdByClerkSearch
=
""
;
}
clerkSearchDTO
.
setEnterpriseId
(
enterpriseId
);
if
(!
hasStoreIds
)
{
clerkSearchDTO
.
setStoreIds
(
storeIdByClerkSearch
);
}
//
List<TabStoreGroup> groupList = storeGroupService.listStoreGroupAndChildren(clerkSearchDTO.getStoreGroupId());
//
List<Integer> groupIds = groupList.stream().map(TabStoreGroup::getStoreGroupId).collect(Collectors.toList());
//
// 查询条件对应的storeId
//
String storeIdByClerkSearch;
//
if (StringUtils.isNotBlank(clerkSearchDTO.getSearch())) {
//
List<Integer> storeInfoIdsBySearch = clerkService.getStoreInfoIdsBySearch(enterpriseId, clerkSearchDTO.getSearch());
//
if (CollectionUtils.isEmpty(groupIds) || CollectionUtils.isEmpty(storeInfoIdsBySearch)) {
//
return ServiceResponse.success(new Page<>());
//
} else {
//
storeIdByClerkSearch = getStoreIdByStoreInfoIds(storeInfoIdsBySearch, null);
//
}
//
} else {
//
storeIdByClerkSearch = "";
//
}
//
clerkSearchDTO.setEnterpriseId(enterpriseId);
//
if (!hasStoreIds) {
//
clerkSearchDTO.setStoreIds(storeIdByClerkSearch);
//
}
ServiceResponse
<
Page
<
StoreDTO
>>
serviceResponse
=
listStoreIds
(
clerkSearchDTO
,
pageNum
,
pageSize
);
if
(!
serviceResponse
.
isSuccess
())
{
return
ServiceResponse
.
failure
(
serviceResponse
.
getCode
(),
serviceResponse
.
getMessage
());
...
...
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