Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
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
haoban3.0
haoban-manage3.0
Commits
2be23b3a
Commit
2be23b3a
authored
May 31, 2024
by
guojx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
查询分组下的门店,即无归属门店
parent
2831134b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
8 deletions
+4
-8
EventTrackingController.java
...haoban/manage/web/controller/EventTrackingController.java
+4
-1
StoreAuthUtils.java
.../com/gic/haoban/manage/web/utils/data/StoreAuthUtils.java
+0
-7
No files found.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/EventTrackingController.java
View file @
2be23b3a
...
@@ -7,6 +7,8 @@ import com.gic.api.base.commons.JSONResponse;
...
@@ -7,6 +7,8 @@ import com.gic.api.base.commons.JSONResponse;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.Page
;
import
com.gic.commons.util.DataApiUtils
;
import
com.gic.commons.util.DataApiUtils
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO
;
import
com.gic.haoban.common.utils.AuthWebRequestUtil
;
import
com.gic.haoban.manage.web.handle.WechatEventTrackingClerkDetailHandle
;
import
com.gic.haoban.manage.web.handle.WechatEventTrackingClerkDetailHandle
;
import
com.gic.haoban.manage.web.handle.WechatEventTrackingStoreGroupHandle
;
import
com.gic.haoban.manage.web.handle.WechatEventTrackingStoreGroupHandle
;
import
com.gic.haoban.manage.web.qo.eventtracking.WechatEventTrackingClerkDetailQO
;
import
com.gic.haoban.manage.web.qo.eventtracking.WechatEventTrackingClerkDetailQO
;
...
@@ -252,7 +254,8 @@ public class EventTrackingController extends NewBaseController {
...
@@ -252,7 +254,8 @@ public class EventTrackingController extends NewBaseController {
*/
*/
@RequestMapping
(
value
=
"get-unaffiliated-store"
)
@RequestMapping
(
value
=
"get-unaffiliated-store"
)
public
RestResponse
<
List
<
String
>>
getUnaffiliatedStoreByStoreGroupId
(
String
storeGroupId
)
{
public
RestResponse
<
List
<
String
>>
getUnaffiliatedStoreByStoreGroupId
(
String
storeGroupId
)
{
return
RestResponse
.
successResult
(
storeAuthUtils
.
getUnaffiliatedStoreByStoreGroupId
(
storeGroupId
));
WebLoginDTO
login
=
AuthWebRequestUtil
.
getLoginUser
();
return
RestResponse
.
successResult
(
storeAuthUtils
.
getPreStoreIdList
(
storeGroupId
,
login
.
getEnterpriseId
()));
}
}
/**
/**
...
...
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/utils/data/StoreAuthUtils.java
View file @
2be23b3a
...
@@ -270,13 +270,6 @@ public class StoreAuthUtils {
...
@@ -270,13 +270,6 @@ public class StoreAuthUtils {
return
storeIdList
;
return
storeIdList
;
}
}
public
List
<
String
>
getUnaffiliatedStoreByStoreGroupId
(
String
storeGroupId
)
{
String
[]
queryArr
=
new
String
[]{
storeGroupId
};
List
<
String
>
storeIdList
=
storeService
.
getStoreIdListByGroupId
(
queryArr
,
getAllStoreStatus
().
stream
().
mapToInt
(
e
->
Integer
.
parseInt
(
e
)).
boxed
().
collect
(
Collectors
.
toList
()));
return
storeIdList
;
}
private
String
getPreStoreGroupId
(
String
preStoreGroupId
,
String
enterpriseId
)
{
private
String
getPreStoreGroupId
(
String
preStoreGroupId
,
String
enterpriseId
)
{
if
(
isAllStoreGroup
(
preStoreGroupId
))
{
if
(
isAllStoreGroup
(
preStoreGroupId
))
{
return
initGroupId
(
enterpriseId
);
return
initGroupId
(
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