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
1
Merge Requests
1
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
9fe1aee5
Commit
9fe1aee5
authored
May 29, 2020
by
huangZW
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
11
parent
fdfe1854
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
6 deletions
+13
-6
AuditController.java
...com/gic/haoban/manage/web/controller/AuditController.java
+13
-6
No files found.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java
View file @
9fe1aee5
...
...
@@ -23,6 +23,7 @@ import com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi;
import
com.gic.haoban.manage.api.dto.AuditDTO
;
import
com.gic.haoban.manage.api.dto.StaffClerkRelationDTO
;
import
com.gic.haoban.manage.api.dto.StaffDTO
;
import
com.gic.haoban.manage.api.enums.AuditType
;
import
com.gic.haoban.manage.api.service.AuditApiService
;
import
com.gic.haoban.manage.api.service.StaffApiService
;
import
com.gic.haoban.manage.api.service.StaffClerkRelationApiService
;
...
...
@@ -46,7 +47,7 @@ public class AuditController extends WebBaseController{
@Autowired
private
SyncHaobanToGicServiceApi
syncHaobanToGicServiceApi
;
//关联记录列表
@RequestMapping
(
"clerk-apply-list"
)
public
HaobanResponse
staffStoreList
(
String
staffId
,
Integer
auditType
,
Integer
auditStatus
,
String
wxEnterpriseId
,
BasePageInfo
pageInfo
){
if
(
StringUtils
.
isAnyBlank
(
staffId
,
wxEnterpriseId
)){
...
...
@@ -83,7 +84,7 @@ public class AuditController extends WebBaseController{
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
pageResult2
);
}
//门店记录列表
@RequestMapping
(
"store-apply-list"
)
public
HaobanResponse
storeApplyList
(
String
storeId
,
String
wxEnterpriseId
,
BasePageInfo
pageInfo
,
Integer
auditType
,
Integer
auditStatus
){
if
(
StringUtils
.
isAnyBlank
(
storeId
,
wxEnterpriseId
)){
...
...
@@ -122,7 +123,7 @@ public class AuditController extends WebBaseController{
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
pageResult2
);
}
//审核,1同意,2拒绝,3取消审核
@RequestMapping
(
"clerk-audit"
)
public
HaobanResponse
clerkAudit
(
String
auditId
,
String
auditReason
,
Integer
auditStatus
,
String
wxEnterpriseId
,
String
staffId
){
if
(
StringUtils
.
isAnyBlank
(
auditId
,
wxEnterpriseId
)){
...
...
@@ -142,6 +143,7 @@ public class AuditController extends WebBaseController{
audit
.
setAuditName
(
staff
.
getStaffName
());
}
if
(
auditStatus
==
1
){
//审核同意
String
oldValue
=
audit
.
getOldValue
();
String
clerkCode
=
""
;
String
enterpriseId
=
""
;
...
...
@@ -159,7 +161,8 @@ public class AuditController extends WebBaseController{
phoneNumber
=
json
.
getString
(
"phoneNumber"
);
nationCode
=
json
.
getString
(
"nationCode"
);
String
storeId
=
audit
.
getCommitStoreId
();
if
(
audit
.
getAuditType
()
==
2
){
if
(
audit
.
getAuditType
()
==
AuditType
.
CLERK_BIND
.
getCode
()){
//导购绑定
StaffClerkRelationDTO
staffClerkRelation
=
staffClerkRelationApiService
.
getByCodeAndEnterpriseId
(
clerkCode
,
enterpriseId
);
if
(
staffClerkRelation
!=
null
){
return
resultResponse
(
HaoBanErrCode
.
ERR_111117
);
...
...
@@ -175,21 +178,25 @@ public class AuditController extends WebBaseController{
audit
.
setAuditStatus
(
1
);
}
}
if
(
audit
.
getAuditType
()
==
3
){
if
(
audit
.
getAuditType
()
==
AuditType
.
CLERK_ADD
.
getCode
()){
//导购新增
boolean
flag
=
syncHaobanToGicServiceApi
.
syncClerkToGicClerkAdd
(
storeId
,
clerkCode
,
sex
,
staff
.
getStaffName
(),
phoneNumber
,
nationCode
,
null
);
if
(!
flag
){
return
resultResponse
(
HaoBanErrCode
.
ERR_10010
);
}
audit
.
setAuditStatus
(
1
);
}
if
(
audit
.
getAuditType
()
==
4
){
if
(
audit
.
getAuditType
()
==
AuditType
.
CLERK_DEL
.
getCode
()){
//导购删除
syncHaobanToGicServiceApi
.
delGicClerk
(
clerkId
);
audit
.
setAuditStatus
(
1
);
}
}
else
if
(
auditStatus
==
2
){
//审核拒绝
audit
.
setAuditReason
(
auditReason
);
audit
.
setAuditStatus
(
2
);
}
else
if
(
auditStatus
==
3
){
//取消审核
audit
.
setAuditStatus
(
3
);
}
auditApiService
.
update
(
audit
);
...
...
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