Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-data-cloud
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-data-cloud
Commits
e647984e
Commit
e647984e
authored
Sep 04, 2020
by
陶光胜
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' into 'master'
线上权限调整 See merge request
!51
parents
7bfae65d
89f08291
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
5 deletions
+20
-5
StoreSearchUtils.java
...n/java/com/gic/cloud/web/controller/StoreSearchUtils.java
+19
-5
StoreWidgetController.java
...a/com/gic/cloud/web/controller/StoreWidgetController.java
+1
-0
No files found.
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreSearchUtils.java
View file @
e647984e
...
...
@@ -82,6 +82,13 @@ public class StoreSearchUtils {
return
list
;
}
List
<
Integer
>
resultList
=
new
ArrayList
<>();
TempStoreConditionDTO
tempStoreConditionDTO
=
this
.
tempStoreConditionApiService
.
getTempStoreCondition
(
enterpriseId
).
getResult
();
List
<
Integer
>
tempStoreIdList
=
new
ArrayList
<>();
if
(
tempStoreConditionDTO
!=
null
)
{
Integer
tempStoreId
=
tempStoreConditionDTO
.
getStoreWidgetId
();
tempStoreIdList
=
this
.
storeWidgetApiService
.
listStoreInfoIdByStoreWidgetId
(
enterpriseId
,
tempStoreId
).
getResult
();
}
final
List
<
Integer
>
tempStoreIdListf
=
tempStoreIdList
;
if
(
StringUtils
.
isNotBlank
(
searchJson
)){
JSONObject
json
=
JSON
.
parseObject
(
searchJson
);
StoreSearchQo
storeSearchQo
=
json
.
getObject
(
StoreChannelEnum
.
OFFLINE
.
getChannel
().
toString
(),
StoreSearchQo
.
class
);
...
...
@@ -104,10 +111,7 @@ public class StoreSearchUtils {
storeSearchDTO
.
setStoreInfoIds
(
storeSearchDTO
.
getStoreInfoIds
()+
","
+
storeInfoIds
);
}
if
(
storeSearchQo
.
getTmpStore
()
==
0
){
TempStoreConditionDTO
result
=
this
.
tempStoreConditionApiService
.
getTempStoreCondition
(
enterpriseId
).
getResult
();
if
(
result
!=
null
){
Integer
tempStoreId
=
result
.
getStoreWidgetId
();
List
<
Integer
>
tempStoreIdList
=
this
.
storeWidgetApiService
.
listStoreInfoIdByStoreWidgetId
(
enterpriseId
,
tempStoreId
).
getResult
();
if
(
CollectionUtils
.
isNotEmpty
(
tempStoreIdList
)){
storeSearchDTO
.
setStoreIdsOfNot
(
StringUtils
.
join
(
tempStoreIdList
,
","
));
}
}
...
...
@@ -129,7 +133,17 @@ public class StoreSearchUtils {
}
}
}
else
{
resultList
=
storeAuth
.
getStoreInfoIdList
();
if
(
CollectionUtils
.
isNotEmpty
(
storeAuth
.
getStoreInfoIdList
())){
resultList
=
storeAuth
.
getStoreInfoIdList
().
stream
().
filter
(
s
->
{
if
(
CollectionUtils
.
isNotEmpty
(
tempStoreIdListf
)){
if
(
tempStoreIdListf
.
contains
(
s
)){
return
true
;
}
else
{
return
false
;
}
}
else
return
true
;
}).
collect
(
Collectors
.
toList
());
}
}
if
(
CollectionUtils
.
isNotEmpty
(
resultList
)){
RedisUtil
.
setCache
(
key
,
1
,
10
l
,
TimeUnit
.
MINUTES
);
...
...
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreWidgetController.java
View file @
e647984e
...
...
@@ -66,6 +66,7 @@ public class StoreWidgetController {
StoreWidgetIndexVo
vo
=
new
StoreWidgetIndexVo
();
StoreAuth
storeAuth
=
dataAuthUtils
.
getStoreAuth
(
userId
,
enterpriseId
);
OnLineAuth
onlineStoreAuth
=
dataAuthUtils
.
getOnlineStore
(
userId
,
enterpriseId
);
log
.
info
(
"storeWidgetIndex:{},{}"
,
JSON
.
toJSONString
(
storeAuth
),
JSON
.
toJSONString
(
onlineStoreAuth
));
List
<
IndexItemVo
>
items
=
new
ArrayList
<>();
if
(
storeAuth
.
isHasAuth
()
&&
onlineStoreAuth
.
isHasAuth
()){
//线上线下多渠道
IndexItemVo
offLine
=
new
IndexItemVo
();
...
...
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