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
5a5caf0e
Commit
5a5caf0e
authored
Sep 03, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' into 'master'
Developer See merge request
!42
parents
8c0b73b7
f2839e37
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
UpdateTipService.java
...src/main/java/com/gic/cloud/service/UpdateTipService.java
+1
-1
UpdateTipServiceImpl.java
...java/com/gic/cloud/service/impl/UpdateTipServiceImpl.java
+5
-2
StoreSearchUtils.java
...n/java/com/gic/cloud/web/controller/StoreSearchUtils.java
+4
-0
No files found.
gic-data-cloud-service/src/main/java/com/gic/cloud/service/UpdateTipService.java
View file @
5a5caf0e
...
...
@@ -22,7 +22,7 @@ public interface UpdateTipService {
void
publish
(
Integer
businessId
,
Integer
type
);
void
erase
(
Integer
userId
,
Integer
busines
sId
,
Integer
type
);
void
erase
(
Integer
userId
,
Integer
updateTip
sId
,
Integer
type
);
Map
<
Integer
,
TabUpdateTips
>
mapByIndexIdAndUser
(
List
<
Integer
>
indexIdList
,
int
type
,
Integer
userId
);
}
gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/UpdateTipServiceImpl.java
View file @
5a5caf0e
...
...
@@ -80,8 +80,11 @@ public class UpdateTipServiceImpl implements UpdateTipService {
}
@Override
public
void
erase
(
Integer
userId
,
Integer
businessId
,
Integer
type
)
{
tabUpdateTipsMapper
.
updateStatus
(
businessId
,
type
,
userId
,
0
);
public
void
erase
(
Integer
userId
,
Integer
updateTipsId
,
Integer
type
)
{
TabUpdateTips
tabUpdateTips
=
new
TabUpdateTips
();
tabUpdateTips
.
setUpdateTipsId
(
updateTipsId
);
tabUpdateTips
.
setShowStatus
(
0
);
tabUpdateTipsMapper
.
updateByPrimaryKeySelective
(
tabUpdateTips
);
}
@Override
...
...
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreSearchUtils.java
View file @
5a5caf0e
...
...
@@ -72,8 +72,10 @@ public class StoreSearchUtils {
}
public
List
<
Integer
>
storeSearch
(
Integer
userId
,
Integer
enterpriseId
,
String
searchJson
){
log
.
info
(
"storeSearchParams:{},{},{}"
,
userId
,
enterpriseId
,
searchJson
);
String
key
=
"1:"
+
enterpriseId
+
":"
+
userId
+
":"
+
(
StringUtils
.
isNotBlank
(
searchJson
)
?
searchJson
.
hashCode
()
:
"searchJSON"
.
hashCode
());
StoreAuth
storeAuth
=
this
.
dataAuthUtils
.
getStoreAuth
(
userId
,
enterpriseId
);
log
.
info
(
"storeAuth:{}"
,
JSON
.
toJSONString
(
storeAuth
));
if
(!
storeAuth
.
isHasAuth
()){
ArrayList
<
Integer
>
list
=
new
ArrayList
<>();
list
.
add
(
0
);
...
...
@@ -110,6 +112,7 @@ public class StoreSearchUtils {
}
}
ServiceResponse
<
Page
<
StoreDTO
>>
pageServiceResponse
=
this
.
storeApiService
.
listStore
(
storeSearchDTO
,
1
,
20000
);
log
.
info
(
"storeResule:{}"
,
JSON
.
toJSONString
(
pageServiceResponse
));
if
(
pageServiceResponse
.
isSuccess
()
&&
pageServiceResponse
.
getResult
()
!=
null
&&
CollectionUtils
.
isNotEmpty
(
pageServiceResponse
.
getResult
().
getResult
())){
List
<
StoreDTO
>
storeDTOList
=
pageServiceResponse
.
getResult
().
getResult
();
List
<
Integer
>
storeInfoIdList
=
storeDTOList
.
stream
().
map
(
storeDTO
->
storeDTO
.
getStoreInfoId
()).
collect
(
Collectors
.
toList
());
...
...
@@ -138,6 +141,7 @@ public class StoreSearchUtils {
public
List
<
String
>
onLineStoreSearch
(
Integer
userId
,
Integer
enterpriseId
,
String
searchJson
){
OnLineAuth
onlineStoreAuth
=
this
.
dataAuthUtils
.
getOnlineStore
(
userId
,
enterpriseId
);
log
.
info
(
"onlineStoreAuth:{}"
,
JSON
.
toJSONString
(
onlineStoreAuth
));
List
<
String
>
list
=
new
ArrayList
<>();
if
(
onlineStoreAuth
.
isHasAuth
()){
this
.
getOnlineStoreIds
(
searchJson
,
onlineStoreAuth
,
list
,
StoreChannelEnum
.
GICMALL
.
getChannel
(),
userId
,
enterpriseId
);
...
...
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