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
b979ffc7
Commit
b979ffc7
authored
Feb 16, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
门店呢查询接口,添加门店标签入参查询
parent
ad21a793
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletions
+12
-1
StoreController.java
...in/java/com/gic/store/web/controller/StoreController.java
+12
-1
No files found.
gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java
View file @
b979ffc7
...
...
@@ -81,6 +81,10 @@ public class StoreController extends DownloadUtils {
private
WeixinWxaFunService
weixinWxaFunService
;
@Autowired
private
DownloadReportApiService
downloadReportApiService
;
@Autowired
private
StoreTagApiService
storeTagApiService
;
@Autowired
private
StoreWidgetApiService
storeWidgetApiService
;
private
Map
<
Integer
,
SimpleDateFormat
>
map
=
new
ConcurrentHashMap
<>();
private
Map
<
Integer
,
SimpleDateFormat
>
map1
=
new
ConcurrentHashMap
<>();
...
...
@@ -134,7 +138,7 @@ public class StoreController extends DownloadUtils {
}
@RequestMapping
(
"/store-list"
)
public
RestResponse
storeList
(
@RequestBody
StoreSearchDTO
storeSearchDTO
)
{
public
RestResponse
storeList
(
@RequestBody
StoreSearchDTO
storeSearchDTO
,
Integer
storeTagId
)
{
logger
.
info
(
"查询条件:{}"
,
JSON
.
toJSONString
(
storeSearchDTO
));
Integer
enterpriseId
=
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
();
Integer
userId
=
UserDetailUtils
.
getUserDetail
().
getUserId
();
...
...
@@ -142,6 +146,13 @@ public class StoreController extends DownloadUtils {
if
(
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
()
!=
null
){
storeSearchDTO
.
setStoreResource
(
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
().
getStoreResource
());
}
//门店标签
ServiceResponse
<
StoreTagDTO
>
storeTagResult
=
storeTagApiService
.
getByStoreTagId
(
storeTagId
);
if
(
storeTagResult
.
isSuccess
())
{
storeSearchDTO
.
setStoreResource
(
Long
.
parseLong
(
storeTagResult
.
getResult
().
getStoreWidgetId
().
toString
()));
}
String
key
=
StoreRedisKeyUtils
.
getStoreListSourceKey
(
enterpriseId
,
userId
);
Object
obj
=
RedisUtil
.
getCache
(
key
);
String
returnFileds
=
StoreESFieldsEnum
.
STOREID
.
getField
();
...
...
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