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
be2cdbef
Commit
be2cdbef
authored
Feb 18, 2020
by
huangZW
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
111
parent
4856432f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
101 additions
and
0 deletions
+101
-0
ClerkController.java
...com/gic/haoban/manage/web/controller/ClerkController.java
+43
-0
ClerkVo.java
...b/src/main/java/com/gic/haoban/manage/web/vo/ClerkVo.java
+58
-0
No files found.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
View file @
be2cdbef
package
com
.
gic
.
haoban
.
manage
.
web
.
controller
;
package
com
.
gic
.
haoban
.
manage
.
web
.
controller
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
cn.hutool.core.collection.CollectionUtil
;
import
com.gic.clerk.api.dto.ClerkDTO
;
import
com.gic.clerk.api.service.ClerkService
;
import
com.gic.clerk.api.service.ClerkService
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.haoban.common.utils.HaobanResponse
;
import
com.gic.haoban.common.utils.HaobanResponse
;
import
com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO
;
import
com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO
;
import
com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService
;
import
com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService
;
import
com.gic.haoban.manage.web.errCode.HaoBanErrCode
;
import
com.gic.haoban.manage.web.errCode.HaoBanErrCode
;
import
com.gic.haoban.manage.web.vo.ClerkVo
;
@RestController
@RestController
public
class
ClerkController
extends
WebBaseController
{
public
class
ClerkController
extends
WebBaseController
{
...
@@ -17,6 +26,40 @@ public class ClerkController extends WebBaseController{
...
@@ -17,6 +26,40 @@ public class ClerkController extends WebBaseController{
private
ClerkService
clerkService
;
private
ClerkService
clerkService
;
@Autowired
@Autowired
private
StaffDepartmentRelatedApiService
staffDepartmentRelatedApiService
;
private
StaffDepartmentRelatedApiService
staffDepartmentRelatedApiService
;
//导购列表
@RequestMapping
(
"/clerk-list"
)
public
HaobanResponse
clerkList
(
String
storeId
,
String
bindFlag
,
String
departmentId
)
{
List
<
StaffDepartmentRelatedDTO
>
list
=
staffDepartmentRelatedApiService
.
listByDepartmentId
(
departmentId
);
List
<
ClerkVo
>
result
=
new
ArrayList
<
ClerkVo
>();
//绑定的clerk
if
(
"1"
.
equals
(
bindFlag
)){
// 调陶接口获取详情数据
if
(
CollectionUtil
.
isNotEmpty
(
list
)){
List
<
String
>
clerkCodes
=
list
.
stream
().
filter
(
s
->
s
.
getClerkCode
()!=
null
).
map
(
s
->
s
.
getClerkCode
()).
collect
(
Collectors
.
toList
());
if
(
CollectionUtil
.
isNotEmpty
(
clerkCodes
)){
List
<
ClerkDTO
>
clerkList
=
clerkService
.
listClerk
(
storeId
,
clerkCodes
,
true
);
result
=
EntityUtil
.
changeEntityListByJSON
(
ClerkVo
.
class
,
clerkList
);
}
}
}
else
{
//未绑定的clerk
// 调陶接口获取详情数据
if
(
CollectionUtil
.
isNotEmpty
(
list
)){
List
<
String
>
clerkCodes
=
list
.
stream
().
filter
(
s
->
s
.
getClerkCode
()!=
null
).
map
(
s
->
s
.
getClerkCode
()).
collect
(
Collectors
.
toList
());
if
(
CollectionUtil
.
isNotEmpty
(
clerkCodes
)){
List
<
ClerkDTO
>
clerkList
=
clerkService
.
listClerk
(
storeId
,
clerkCodes
,
false
);
result
=
EntityUtil
.
changeEntityListByJSON
(
ClerkVo
.
class
,
clerkList
);
}
}
else
{
List
<
String
>
clerkCodes
=
new
ArrayList
();
clerkCodes
.
add
(
"xxxXXXX"
);
List
<
ClerkDTO
>
clerkList
=
clerkService
.
listClerk
(
storeId
,
clerkCodes
,
false
);
result
=
EntityUtil
.
changeEntityListByJSON
(
ClerkVo
.
class
,
clerkList
);
}
}
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
result
);
}
//成员绑定
//成员绑定
@RequestMapping
(
"/staff-bind"
)
@RequestMapping
(
"/staff-bind"
)
public
HaobanResponse
staffBind
(
String
clerkCode
,
String
staffDepartmentRelatedId
)
{
public
HaobanResponse
staffBind
(
String
clerkCode
,
String
staffDepartmentRelatedId
)
{
...
...
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/ClerkVo.java
0 → 100644
View file @
be2cdbef
package
com
.
gic
.
haoban
.
manage
.
web
.
vo
;
import
java.io.Serializable
;
/**
* Created 2018/10/22.
*
* @author hua
*/
public
class
ClerkVo
implements
Serializable
{
/**
*
*/
private
static
final
long
serialVersionUID
=
1L
;
private
String
clerkId
;
private
String
clerkCode
;
private
String
nationCode
;
private
String
phoneNumber
;
private
String
bindFlag
;
private
String
clerkName
;
public
String
getClerkId
()
{
return
clerkId
;
}
public
void
setClerkId
(
String
clerkId
)
{
this
.
clerkId
=
clerkId
;
}
public
String
getClerkCode
()
{
return
clerkCode
;
}
public
void
setClerkCode
(
String
clerkCode
)
{
this
.
clerkCode
=
clerkCode
;
}
public
String
getNationCode
()
{
return
nationCode
;
}
public
void
setNationCode
(
String
nationCode
)
{
this
.
nationCode
=
nationCode
;
}
public
String
getPhoneNumber
()
{
return
phoneNumber
;
}
public
void
setPhoneNumber
(
String
phoneNumber
)
{
this
.
phoneNumber
=
phoneNumber
;
}
public
String
getBindFlag
()
{
return
bindFlag
;
}
public
void
setBindFlag
(
String
bindFlag
)
{
this
.
bindFlag
=
bindFlag
;
}
public
String
getClerkName
()
{
return
clerkName
;
}
public
void
setClerkName
(
String
clerkName
)
{
this
.
clerkName
=
clerkName
;
}
}
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