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
cf6e0f08
Commit
cf6e0f08
authored
May 19, 2021
by
fudahua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
导购可编辑状态
parent
5f687f00
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
5 deletions
+21
-5
WxEnterpriseRelationDetailDTO.java
.../haoban/manage/api/dto/WxEnterpriseRelationDetailDTO.java
+9
-0
ClerkController.java
...com/gic/haoban/manage/web/controller/ClerkController.java
+12
-5
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseRelationDetailDTO.java
View file @
cf6e0f08
...
...
@@ -18,8 +18,17 @@ public class WxEnterpriseRelationDetailDTO implements Serializable {
private
String
staffName
;
private
int
wxEnterpriseType
;
private
int
memberOpenCardFlag
;
private
Integer
clerkEditFlag
;
private
List
<
StoreOrGroupInfoDTO
>
relations
;
public
Integer
getClerkEditFlag
()
{
return
clerkEditFlag
;
}
public
void
setClerkEditFlag
(
Integer
clerkEditFlag
)
{
this
.
clerkEditFlag
=
clerkEditFlag
;
}
public
String
getWxEnterpriseRelatedId
()
{
return
wxEnterpriseRelatedId
;
}
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
View file @
cf6e0f08
...
...
@@ -113,7 +113,7 @@ public class ClerkController extends WebBaseController{
//门店成员列表
@RequestMapping
(
"/store-clerks"
)
public
HaobanResponse
storeClerks
(
String
storeId
)
{
public
HaobanResponse
storeClerks
(
String
wxEnterpriseId
,
String
storeId
,
String
version
)
{
if
(
StringUtils
.
isAnyBlank
(
storeId
)){
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
...
...
@@ -143,9 +143,19 @@ public class ClerkController extends WebBaseController{
}
resultList
.
add
(
vo
);
}
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
resultList
);
if
(
StringUtils
.
isBlank
(
version
))
{
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
resultList
);
}
else
{
WxEnterpriseRelationDetailDTO
enterpriseBindInfo
=
wxEnterpriseRelatedApiService
.
getEnterpriseBindInfo
(
wxEnterpriseId
,
storeDTO
.
getEnterpriseId
());
Map
<
String
,
Object
>
ret
=
new
HashMap
<>();
ret
.
put
(
"clerkEditFlag"
,
enterpriseBindInfo
.
getClerkEditFlag
());
ret
.
put
(
"clerkList"
,
resultList
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
ret
);
}
}
//获取后台认证配置
@RequestMapping
(
"/get-audit-setting"
)
public
HaobanResponse
getAuditSetting
(
String
wxEnterpriseId
)
{
...
...
@@ -753,9 +763,6 @@ public class ClerkController extends WebBaseController{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"bindList"
,
bindList
);
map
.
put
(
"unBindList"
,
unBindList
);
WxEnterpriseRelationDetailDTO
enterpriseBindInfo
=
wxEnterpriseRelatedApiService
.
getEnterpriseBindInfo
(
wxEnterpriseId
,
store
.
getEnterpriseId
());
// map.put("clerkEditFlag",enterpriseBindInfo.get)
//todo 导购是否可编辑
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
map
);
}
...
...
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