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
1ddef4eb
Commit
1ddef4eb
authored
Jun 02, 2020
by
huangZW
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
111
parent
e308c691
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
69 additions
and
20 deletions
+69
-20
StaffDepartmentRelatedApiService.java
.../manage/api/service/StaffDepartmentRelatedApiService.java
+6
-0
AuditApiServiceImpl.java
.../manage/service/service/out/impl/AuditApiServiceImpl.java
+22
-20
StaffDepartmentRelatedApiServiceImpl.java
...ervice/out/impl/StaffDepartmentRelatedApiServiceImpl.java
+41
-0
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffDepartmentRelatedApiService.java
View file @
1ddef4eb
...
...
@@ -38,5 +38,11 @@ public interface StaffDepartmentRelatedApiService {
public
boolean
sendAuditMessage
(
String
clerkId
,
String
title
,
String
content
,
String
pageUrl
,
int
auditStatus
,
String
auditReason
);
List
<
StaffDepartmentRelatedDTO
>
listByStaffIds
(
List
<
String
>
staffIds
);
public
void
sendClerkBind
(
String
clerkId
,
String
clerkCode
,
int
auditStatus
,
String
auditReason
);
public
void
sendClerkAdd
(
String
clerkId
,
String
clerkCode
,
int
auditStatus
,
String
auditReason
);
public
void
sendClerkDel
(
String
clerkId
,
String
clerkCode
,
int
auditStatus
,
String
auditReason
);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java
View file @
1ddef4eb
...
...
@@ -184,15 +184,7 @@ public class AuditApiServiceImpl implements AuditApiService{
if
(
org
.
apache
.
commons
.
lang
.
StringUtils
.
isNotBlank
(
batchId
)){
insertBatchLog
(
batchId
,
AuditRsultType
.
success
.
getCode
(),
tab
);
}
//TODO huang 发送申请人,我的记录页
ClerkDTO
clerk
=
clerkService
.
getclerkById
(
obj
.
getClerkId
());
String
messageTitle
=
"门店账号申请"
;
String
messageContent
=
clerk
.
getClerkName
()+
"申请关联导购code("
+
obj
.
getClerkCode
()+
")"
;
JSONObject
jsonObject
=
new
JSONObject
();
jsonObject
.
put
(
"storeId"
,
clerk
.
getStoreId
());
String
data
=
jsonObject
.
toJSONString
();
String
pageUrl
=
staffDepartmentRelatedApiService
.
getPageUrl
(
AppPageType
.
MY_RELATED_RECORD
.
getCode
(),
data
);
staffDepartmentRelatedApiService
.
sendAuditMessage
(
obj
.
getClerkId
(),
messageTitle
,
messageContent
,
pageUrl
,
1
,
""
);
staffDepartmentRelatedApiService
.
sendClerkBind
(
obj
.
getClerkId
(),
obj
.
getClerkCode
(),
1
,
""
);
}
else
if
(
auditType
==
AuditType
.
CLERK_ADD
.
getCode
()){
//门店导购新增
...
...
@@ -205,12 +197,12 @@ public class AuditApiServiceImpl implements AuditApiService{
insertBatchLog
(
batchId
,
AuditRsultType
.
fail
.
getCode
(),
tab
);
return
"0"
;
}
}
else
{
//成功
if
(
org
.
apache
.
commons
.
lang
.
StringUtils
.
isNotBlank
(
batchId
)){
insertBatchLog
(
batchId
,
1
,
tab
);
}
staffDepartmentRelatedApiService
.
sendClerkAdd
(
obj
.
getClerkId
(),
obj
.
getClerkCode
(),
1
,
""
);
}
}
else
if
(
auditType
==
AuditType
.
CLERK_DEL
.
getCode
()){
...
...
@@ -221,6 +213,7 @@ public class AuditApiServiceImpl implements AuditApiService{
if
(
org
.
apache
.
commons
.
lang
.
StringUtils
.
isNotBlank
(
batchId
)){
insertBatchLog
(
batchId
,
AuditRsultType
.
success
.
getCode
(),
tab
);
}
staffDepartmentRelatedApiService
.
sendClerkDel
(
obj
.
getClerkId
(),
obj
.
getClerkCode
(),
1
,
""
);
}
else
if
(
auditType
==
AuditType
.
CLERK_UNBIND
.
getCode
()){
//解绑申请,无需审核,直接通过
}
...
...
@@ -235,17 +228,26 @@ public class AuditApiServiceImpl implements AuditApiService{
tab
.
setAuditReason
(
auditReason
);
tab
.
setAuditName
(
auditName
);
auditMapper
.
updateByPrimaryKeySelective
(
tab
);
//发送消息
TabHaobanAudit
tab2
=
auditMapper
.
selectByPrimaryKey
(
auditId
);
String
changeField
=
tab2
.
getChangeField
();
String
title
=
"门店信息修改通知"
;
String
content
=
StoreFieldEnum
.
getValueName
(
changeField
);
content
=
"["
+
content
+
"]"
+
"被拒绝。拒绝理由:"
+
auditReason
;
String
staffId
=
tab2
.
getCommitStaffId
();
String
storeId
=
tab2
.
getCommitStoreId
();
this
.
sendMessageByStaffId
(
staffId
,
storeId
,
title
,
content
);
int
auditType
=
tab2
.
getAuditType
();
String
oldValue
=
tab2
.
getOldValue
();
AuditStaffDTO
obj
=
JSONObject
.
parseObject
(
oldValue
,
AuditStaffDTO
.
class
);
//发送消息
if
(
auditType
==
AuditType
.
STORE_CHANGE
.
getCode
()){
String
changeField
=
tab2
.
getChangeField
();
String
title
=
"门店信息修改通知"
;
String
content
=
StoreFieldEnum
.
getValueName
(
changeField
);
content
=
"["
+
content
+
"]"
+
"被拒绝。拒绝理由:"
+
auditReason
;
String
staffId
=
tab2
.
getCommitStaffId
();
String
storeId
=
tab2
.
getCommitStoreId
();
this
.
sendMessageByStaffId
(
staffId
,
storeId
,
title
,
content
);
}
else
if
(
auditType
==
AuditType
.
CLERK_BIND
.
getCode
()){
staffDepartmentRelatedApiService
.
sendClerkBind
(
obj
.
getClerkId
(),
obj
.
getClerkCode
(),
1
,
""
);
}
else
if
(
auditType
==
AuditType
.
CLERK_ADD
.
getCode
())
{
staffDepartmentRelatedApiService
.
sendClerkAdd
(
obj
.
getClerkId
(),
obj
.
getClerkCode
(),
1
,
""
);
}
else
if
(
auditType
==
AuditType
.
CLERK_DEL
.
getCode
())
{
staffDepartmentRelatedApiService
.
sendClerkDel
(
obj
.
getClerkId
(),
obj
.
getClerkCode
(),
1
,
""
);
}
}
@Override
public
int
save
(
Integer
auditType
,
String
wxEnterpriseId
,
String
enterpriseId
,
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffDepartmentRelatedApiServiceImpl.java
View file @
1ddef4eb
...
...
@@ -155,6 +155,47 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
map
.
put
(
"clerkName"
,
clerkDTO
.
getClerkName
());
return
map
;
}
//导购绑定,,审核记录,,消息发送
public
void
sendClerkBind
(
String
clerkId
,
String
clerkCode
,
int
auditStatus
,
String
auditReason
){
//TODO huang 发送申请人,我的记录页
ClerkDTO
clerk
=
clerkService
.
getclerkById
(
clerkId
);
String
messageTitle
=
"门店账号申请"
;
String
messageContent
=
clerk
.
getClerkName
()+
"申请关联导购code("
+
clerkCode
+
")"
;
JSONObject
jsonObject
=
new
JSONObject
();
jsonObject
.
put
(
"storeId"
,
clerk
.
getStoreId
());
String
data
=
jsonObject
.
toJSONString
();
String
pageUrl
=
this
.
getPageUrl
(
AppPageType
.
MY_RELATED_RECORD
.
getCode
(),
data
);
this
.
sendAuditMessage
(
clerkId
,
messageTitle
,
messageContent
,
pageUrl
,
auditStatus
,
auditReason
);
}
//导购新增,,审核记录,,消息发送
public
void
sendClerkAdd
(
String
clerkId
,
String
clerkCode
,
int
auditStatus
,
String
auditReason
){
//TODO huang 发送店长,门店关联记录列表
ClerkDTO
clerk
=
clerkService
.
getclerkById
(
clerkId
);
String
messageTitle
=
"门店导购变更"
;
String
messageContent
=
"新增导购:"
+
clerk
.
getClerkName
()+
"("
+
clerkCode
+
")"
;
JSONObject
jsonObject
=
new
JSONObject
();
jsonObject
.
put
(
"storeId"
,
clerk
.
getStoreId
());
String
data
=
jsonObject
.
toJSONString
();
ClerkDTO
gicClerk
=
clerkService
.
getClerkLeaderByStoreId
(
clerk
.
getStoreId
());
String
pageUrl
=
this
.
getPageUrl
(
AppPageType
.
STORE_RELATED_RECORD
.
getCode
(),
data
);
this
.
sendAuditMessage
(
gicClerk
.
getClerkId
(),
messageTitle
,
messageContent
,
pageUrl
,
auditStatus
,
""
);
}
//导购删除,,审核记录,,消息发送
public
void
sendClerkDel
(
String
clerkId
,
String
clerkCode
,
int
auditStatus
,
String
auditReason
){
//TODO huang 发送店长,门店关联记录列表
ClerkDTO
clerk
=
clerkService
.
getclerkById
(
clerkId
);
String
messageTitle
=
"门店导购变更"
;
String
messageContent
=
"删除导购:"
+
clerk
.
getClerkName
()+
"("
+
clerkCode
+
")"
;
JSONObject
jsonObject
=
new
JSONObject
();
jsonObject
.
put
(
"storeId"
,
clerk
.
getStoreId
());
String
data
=
jsonObject
.
toJSONString
();
ClerkDTO
gicClerk
=
clerkService
.
getClerkLeaderByStoreId
(
clerk
.
getStoreId
());
String
pageUrl
=
this
.
getPageUrl
(
AppPageType
.
STORE_RELATED_RECORD
.
getCode
(),
data
);
this
.
sendAuditMessage
(
gicClerk
.
getClerkId
(),
messageTitle
,
messageContent
,
pageUrl
,
auditStatus
,
""
);
}
@Override
public
boolean
sendSingleMessage
(
String
clerkId
,
String
title
,
String
content
,
String
pageUrl
)
{
...
...
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