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
f24f82c8
Commit
f24f82c8
authored
Feb 18, 2020
by
huangZW
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1111
parent
ef466584
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
0 deletions
+23
-0
ClerkController.java
...com/gic/haoban/manage/web/controller/ClerkController.java
+16
-0
StoreController.java
...com/gic/haoban/manage/web/controller/StoreController.java
+7
-0
No files found.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
View file @
f24f82c8
...
@@ -5,6 +5,7 @@ import java.util.Date;
...
@@ -5,6 +5,7 @@ import java.util.Date;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
org.apache.commons.lang3.StringUtils
;
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
;
...
@@ -50,6 +51,9 @@ public class ClerkController extends WebBaseController{
...
@@ -50,6 +51,9 @@ public class ClerkController extends WebBaseController{
// }
// }
// }
// }
// return resultResponse(HaoBanErrCode.ERR_1,result);
// return resultResponse(HaoBanErrCode.ERR_1,result);
if
(
StringUtils
.
isAnyBlank
(
storeId
,
bindFlag
,
departmentId
)){
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
//绑定的clerk
//绑定的clerk
if
(
"1"
.
equals
(
bindFlag
)){
if
(
"1"
.
equals
(
bindFlag
)){
// 调陶接口获取详情数据
// 调陶接口获取详情数据
...
@@ -82,6 +86,9 @@ public class ClerkController extends WebBaseController{
...
@@ -82,6 +86,9 @@ public class ClerkController extends WebBaseController{
//选择成员列表
//选择成员列表
@RequestMapping
(
"/staff-list"
)
@RequestMapping
(
"/staff-list"
)
public
HaobanResponse
staffList
(
String
departmentId
)
{
public
HaobanResponse
staffList
(
String
departmentId
)
{
if
(
StringUtils
.
isAnyBlank
(
departmentId
)){
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
List
<
StaffDepartmentRelatedDTO
>
list
=
staffDepartmentRelatedApiService
.
listByDepartmentId
(
departmentId
);
List
<
StaffDepartmentRelatedDTO
>
list
=
staffDepartmentRelatedApiService
.
listByDepartmentId
(
departmentId
);
List
<
String
>
staffIds
=
list
.
stream
().
map
(
s
->
s
.
getStaffId
()).
collect
(
Collectors
.
toList
());
List
<
String
>
staffIds
=
list
.
stream
().
map
(
s
->
s
.
getStaffId
()).
collect
(
Collectors
.
toList
());
List
<
StaffDTO
>
resultlist
=
staffApiService
.
listByIds
(
staffIds
);
List
<
StaffDTO
>
resultlist
=
staffApiService
.
listByIds
(
staffIds
);
...
@@ -91,6 +98,9 @@ public class ClerkController extends WebBaseController{
...
@@ -91,6 +98,9 @@ public class ClerkController extends WebBaseController{
//成员绑定
//成员绑定
@RequestMapping
(
"/staff-bind"
)
@RequestMapping
(
"/staff-bind"
)
public
HaobanResponse
staffBind
(
String
clerkCode
,
String
staffDepartmentRelatedId
)
{
public
HaobanResponse
staffBind
(
String
clerkCode
,
String
staffDepartmentRelatedId
)
{
if
(
StringUtils
.
isAnyBlank
(
clerkCode
,
staffDepartmentRelatedId
)){
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
StaffDepartmentRelatedDTO
dto
=
new
StaffDepartmentRelatedDTO
();
StaffDepartmentRelatedDTO
dto
=
new
StaffDepartmentRelatedDTO
();
dto
.
setStaffDepartmentRelatedId
(
staffDepartmentRelatedId
);
dto
.
setStaffDepartmentRelatedId
(
staffDepartmentRelatedId
);
dto
.
setClerkCode
(
clerkCode
);
dto
.
setClerkCode
(
clerkCode
);
...
@@ -101,6 +111,9 @@ public class ClerkController extends WebBaseController{
...
@@ -101,6 +111,9 @@ public class ClerkController extends WebBaseController{
//成员换绑定
//成员换绑定
@RequestMapping
(
"/clerk-unbind"
)
@RequestMapping
(
"/clerk-unbind"
)
public
HaobanResponse
clerkUnbind
(
String
clerkCode
,
String
staffDepartmentRelatedId
)
{
public
HaobanResponse
clerkUnbind
(
String
clerkCode
,
String
staffDepartmentRelatedId
)
{
if
(
StringUtils
.
isAnyBlank
(
clerkCode
,
staffDepartmentRelatedId
)){
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
StaffDepartmentRelatedDTO
one
=
staffDepartmentRelatedApiService
.
getOneByClerkCode
(
clerkCode
);
StaffDepartmentRelatedDTO
one
=
staffDepartmentRelatedApiService
.
getOneByClerkCode
(
clerkCode
);
if
(
one
!=
null
){
if
(
one
!=
null
){
//存在,则先置空
//存在,则先置空
...
@@ -119,6 +132,9 @@ public class ClerkController extends WebBaseController{
...
@@ -119,6 +132,9 @@ public class ClerkController extends WebBaseController{
//店长转让
//店长转让
@RequestMapping
(
"/clerk-manager-tranfer"
)
@RequestMapping
(
"/clerk-manager-tranfer"
)
public
HaobanResponse
clerkManagerTranfer
(
String
clerkCode
,
String
storeId
,
String
staffDepartmentRelatedId
)
{
public
HaobanResponse
clerkManagerTranfer
(
String
clerkCode
,
String
storeId
,
String
staffDepartmentRelatedId
)
{
if
(
StringUtils
.
isAnyBlank
(
clerkCode
,
storeId
,
staffDepartmentRelatedId
)){
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
StaffDepartmentRelatedDTO
one
=
staffDepartmentRelatedApiService
.
getOneByClerkCode
(
clerkCode
);
StaffDepartmentRelatedDTO
one
=
staffDepartmentRelatedApiService
.
getOneByClerkCode
(
clerkCode
);
if
(
one
!=
null
){
if
(
one
!=
null
){
//存在,则先置空
//存在,则先置空
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
View file @
f24f82c8
...
@@ -6,6 +6,7 @@ import java.util.List;
...
@@ -6,6 +6,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
org.apache.commons.lang3.StringUtils
;
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
;
...
@@ -51,6 +52,9 @@ public class StoreController extends WebBaseController{
...
@@ -51,6 +52,9 @@ public class StoreController extends WebBaseController{
//门店列表
//门店列表
@RequestMapping
(
"/store-list"
)
@RequestMapping
(
"/store-list"
)
public
HaobanResponse
storeList
(
String
staffId
,
String
wxEnterpriseId
)
{
public
HaobanResponse
storeList
(
String
staffId
,
String
wxEnterpriseId
)
{
if
(
StringUtils
.
isAnyBlank
(
staffId
,
wxEnterpriseId
)){
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
List
<
DepartmentDTO
>
list
=
departmentApiService
.
listStoreByWxEnterpriseId
(
wxEnterpriseId
);
List
<
DepartmentDTO
>
list
=
departmentApiService
.
listStoreByWxEnterpriseId
(
wxEnterpriseId
);
if
(
CollectionUtil
.
isEmpty
(
list
)){
if
(
CollectionUtil
.
isEmpty
(
list
)){
return
resultResponse
(
HaoBanErrCode
.
ERR_1
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
);
...
@@ -87,6 +91,9 @@ public class StoreController extends WebBaseController{
...
@@ -87,6 +91,9 @@ public class StoreController extends WebBaseController{
//获取首页销售数据
//获取首页销售数据
@RequestMapping
(
"/sale-date"
)
@RequestMapping
(
"/sale-date"
)
public
HaobanResponse
saleDate
(
String
storeId
,
String
wxEnterpriseId
)
{
public
HaobanResponse
saleDate
(
String
storeId
,
String
wxEnterpriseId
)
{
if
(
StringUtils
.
isAnyBlank
(
storeId
,
wxEnterpriseId
)){
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
StoreDTO
store
=
storeService
.
getStore
(
storeId
);
StoreDTO
store
=
storeService
.
getStore
(
storeId
);
String
enterpriseId
=
store
.
getEnterpriseId
();
String
enterpriseId
=
store
.
getEnterpriseId
();
String
date
=
DateUtil
.
format
(
new
Date
(),
"yyyy-MM-dd"
);
String
date
=
DateUtil
.
format
(
new
Date
(),
"yyyy-MM-dd"
);
...
...
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