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
0be96dcf
Commit
0be96dcf
authored
Jul 06, 2021
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
支持直接将店长设置为不启用,不用先转移店长
parent
afe5cfe5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
ClerkService.java
...ice/src/main/java/com/gic/store/service/ClerkService.java
+1
-0
ClerkApiServiceImpl.java
...com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
+1
-1
ClerkController.java
...in/java/com/gic/store/web/controller/ClerkController.java
+1
-7
No files found.
gic-store-service/src/main/java/com/gic/store/service/ClerkService.java
View file @
0be96dcf
...
...
@@ -256,6 +256,7 @@ public interface ClerkService {
TabClerk
getClerkByCode
(
Integer
enterpriseId
,
String
clerkCode
,
Integer
storeInfoId
);
/**
* 支持无店长,可能为空
* getClerkLeaderByStoreInfoId
* @Title: getClerkLeaderByStoreInfoId
* @Description:
...
...
gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
View file @
0be96dcf
...
...
@@ -139,7 +139,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
clerkDTO
.
setPositionId
(
com
.
gic
.
store
.
constant
.
Constants
.
CLERK_LEADER_POSITION_ID
);
}
else
if
(
clerkLeader
.
getClerkId
().
equals
(
clerkDTO
.
getClerkId
())
&&
!
com
.
gic
.
store
.
constant
.
Constants
.
CLERK_LEADER_POSITION_ID
.
equals
(
clerkDTO
.
getPositionId
()))
{
// 当前导购就是店长 要改成不是店长 不能改
return
ServiceResponse
.
failure
(
ErrorCode
.
PARAMETER_ERROR
.
getCode
(),
"门店下必须有一个店长"
);
//支持无店长
}
}
else
if
(
clerkLeader
==
null
)
{
clerkDTO
.
setPositionId
(
com
.
gic
.
store
.
constant
.
Constants
.
CLERK_LEADER_POSITION_ID
);
...
...
gic-store-web/src/main/java/com/gic/store/web/controller/ClerkController.java
View file @
0be96dcf
...
...
@@ -244,13 +244,7 @@ public class ClerkController extends DownloadUtils {
}
clerkDTO
.
setOperatorId
(
UserDetailUtils
.
getUserDetail
().
getUserId
());
clerkDTO
.
setOperatorName
(
UserDetailUtils
.
getUserDetail
().
getUserInfo
().
getUserName
());
if
(
clerkQO
.
getClerkId
()
!=
null
&&
!
com
.
gic
.
store
.
constant
.
Constants
.
CLERK_LEADER_POSITION_ID
.
equals
(
clerkQO
.
getPositionId
()))
{
// 如果门店下只有一个导购 就不能修改店长
List
<
ClerkDTO
>
dtoList
=
clerkApiService
.
listClerkByStoreInfoId
(
enterpriseId
,
clerkQO
.
getStoreInfoId
(),
null
).
getResult
();
if
(
CollectionUtils
.
isNotEmpty
(
dtoList
)
&&
dtoList
.
size
()
==
1
)
{
return
RestResponse
.
failure
(
"0001"
,
"门店下必须存在一名启用状态的店长"
);
}
}
ServiceResponse
serviceResponse
=
clerkApiService
.
saveOrUpdate
(
clerkDTO
);
if
(
serviceResponse
.
isSuccess
())
{
LogUtils
.
createLog
((
clerkQO
.
getClerkId
()
==
null
?
"新增"
:
"编辑"
)
+
"导购"
,
clerkQO
.
getClerkName
());
...
...
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