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
540ac890
Commit
540ac890
authored
Jul 06, 2021
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
共享门店的导购不能编辑,不能转移店长&去掉批量修改状态功能
parent
bf2aee61
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
ClerkApiService.java
.../src/main/java/com/gic/store/service/ClerkApiService.java
+3
-2
ClerkApiServiceImpl.java
...com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
+3
-3
ClerkController.java
...in/java/com/gic/store/web/controller/ClerkController.java
+1
-1
No files found.
gic-store-api/src/main/java/com/gic/store/service/ClerkApiService.java
View file @
540ac890
...
...
@@ -193,7 +193,7 @@ public interface ClerkApiService {
* @Title: updateClerkStatus
* @Description: 批量修改导购状态
* @author zhiwj
* @param enterpriseId 企业id
* @param enterpriseId 企业id
当前操作商户
* @param clerkIds 导购ids
* @param status 状态
* @param userId
...
...
@@ -371,11 +371,12 @@ public interface ClerkApiService {
* @Title: updateClerkLeader
* @Description:
* @author zhiwj
* @param currentEnterpriseId 当前操作商户
* @param clerkId
* @return com.gic.api.base.commons.ServiceResponse
* @throws
*/
ServiceResponse
updateClerkLeader
(
Integer
clerkId
);
ServiceResponse
updateClerkLeader
(
Integer
c
urrentEnterpriseId
,
Integer
c
lerkId
);
/***
* syncClerkToWeimob
...
...
gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
View file @
540ac890
...
...
@@ -589,7 +589,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
}
List
<
TabClerk
>
clerkList
=
this
.
clerkService
.
listClerkByIds
(
clerkIdList
);
//编辑权限验证
validStoreIsOther
(
clerkList
.
get
(
0
).
getEnterpriseId
()
,
clerkList
.
get
(
0
).
getStoreInfoId
());
validStoreIsOther
(
enterpriseId
,
clerkList
.
get
(
0
).
getStoreInfoId
());
Map
<
Integer
,
TabClerk
>
clerkIdMap
=
clerkList
.
stream
().
collect
(
Collectors
.
toMap
(
TabClerk:
:
getClerkId
,
TabClerk
->
TabClerk
));
//过滤掉默认导购
...
...
@@ -895,10 +895,10 @@ public class ClerkApiServiceImpl implements ClerkApiService {
}
@Override
public
ServiceResponse
updateClerkLeader
(
Integer
clerkId
)
{
public
ServiceResponse
updateClerkLeader
(
Integer
c
urrentEnterpriseId
,
Integer
c
lerkId
)
{
TabClerk
clerk
=
this
.
clerkService
.
getById
(
clerkId
);
validStoreIsOther
(
c
lerk
.
getEnterpriseId
()
,
clerk
.
getStoreInfoId
());
validStoreIsOther
(
c
urrentEnterpriseId
,
clerk
.
getStoreInfoId
());
clerk
.
setPositionId
(
com
.
gic
.
store
.
constant
.
Constants
.
CLERK_LEADER_POSITION_ID
);
String
positionName
=
this
.
clerkPositionService
.
getByClerkPositionId
(
clerk
.
getPositionId
()).
getPositionName
();
...
...
gic-store-web/src/main/java/com/gic/store/web/controller/ClerkController.java
View file @
540ac890
...
...
@@ -334,7 +334,7 @@ public class ClerkController extends DownloadUtils {
@RequestMapping
(
"/update-clerk-leader"
)
public
RestResponse
updateClerkLeader
(
Integer
clerkId
)
{
ServiceResponse
serviceResponse
=
clerkApiService
.
updateClerkLeader
(
clerkId
);
ServiceResponse
serviceResponse
=
clerkApiService
.
updateClerkLeader
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
clerkId
);
return
ResultControllerUtils
.
commonResult
(
serviceResponse
);
}
...
...
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