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
93c8c36d
Commit
93c8c36d
authored
Jun 08, 2020
by
huangZW
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
111
parent
5e32bc02
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
62 additions
and
2 deletions
+62
-2
StaffDepartmentRelatedApiService.java
.../manage/api/service/StaffDepartmentRelatedApiService.java
+2
-0
AuditApiServiceImpl.java
.../manage/service/service/out/impl/AuditApiServiceImpl.java
+1
-1
StaffDepartmentRelatedApiServiceImpl.java
...ervice/out/impl/StaffDepartmentRelatedApiServiceImpl.java
+58
-0
AuditController.java
...com/gic/haoban/manage/web/controller/AuditController.java
+1
-1
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffDepartmentRelatedApiService.java
View file @
93c8c36d
...
...
@@ -42,6 +42,8 @@ public interface StaffDepartmentRelatedApiService {
List
<
StaffDepartmentRelatedDTO
>
listByStaffIds
(
List
<
String
>
staffIds
);
public
void
sendClerkBind
(
String
clerkId
,
String
clerkCode
,
int
auditStatus
,
String
auditReason
);
public
void
sendStaffBind
(
String
staffId
,
String
clerkCode
,
String
storeId
,
int
auditStatus
,
String
auditReason
);
public
void
sendClerkAdd
(
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 @
93c8c36d
...
...
@@ -274,7 +274,7 @@ public class AuditApiServiceImpl implements AuditApiService{
String
storeId
=
tab2
.
getCommitStoreId
();
this
.
sendMessageByStaffId
(
staffId
,
storeId
,
title
,
content
);
}
else
if
(
auditType
==
AuditType
.
CLERK_BIND
.
getCode
()){
staffDepartmentRelatedApiService
.
send
ClerkBind
(
obj
.
getClerkId
(),
obj
.
getClerkCode
(),
2
,
auditReason
);
staffDepartmentRelatedApiService
.
send
StaffBind
(
obj
.
getStaffId
(),
obj
.
getClerkCode
(),
tab2
.
getCommitStoreId
(),
2
,
auditReason
);
}
else
if
(
auditType
==
AuditType
.
CLERK_ADD
.
getCode
())
{
staffDepartmentRelatedApiService
.
sendClerkAdd
(
enterpriseId
,
obj
.
getClerkCode
(),
2
,
auditReason
);
}
else
if
(
auditType
==
AuditType
.
CLERK_DEL
.
getCode
())
{
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffDepartmentRelatedApiServiceImpl.java
View file @
93c8c36d
...
...
@@ -21,9 +21,11 @@ import com.gic.clerk.api.service.ClerkService;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.enterprise.api.dto.MessageDTO
;
import
com.gic.haoban.manage.api.dto.ApplicationDTO
;
import
com.gic.haoban.manage.api.dto.StaffDTO
;
import
com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO
;
import
com.gic.haoban.manage.api.enums.AppPageType
;
import
com.gic.haoban.manage.api.service.ApplicationApiService
;
import
com.gic.haoban.manage.api.service.StaffApiService
;
import
com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService
;
import
com.gic.haoban.manage.service.config.Config
;
import
com.gic.haoban.manage.service.dao.mapper.StaffDepartmentRelatedMapper
;
...
...
@@ -67,6 +69,8 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
private
Config
config
;
@Autowired
private
TabHaobanStaffClerkRelationMapper
tabHaobanStaffClerkRelationMapper
;
@Autowired
private
StaffApiService
staffApiService
;
@Override
public
List
<
StaffDepartmentRelatedDTO
>
listByDepartmentId
(
...
...
@@ -164,6 +168,60 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
}
//导购绑定,,审核记录,,消息发送
@Override
public
void
sendStaffBind
(
String
staffId
,
String
clerkCode
,
String
storeId
,
int
auditStatus
,
String
auditReason
){
//TODO huang 发送申请人,我的记录页
StaffDTO
staffDTO
=
staffApiService
.
selectById
(
staffId
);
if
(
staffDTO
==
null
){
logger
.
info
(
"staff不存在,发送消息失败{}"
,
staffId
);
return
;
}
String
messageTitle
=
"门店账号申请"
;
String
content
=
staffDTO
.
getStaffName
()+
"申请关联导购code("
+
clerkCode
+
")"
;
JSONObject
jsonObject
=
new
JSONObject
();
jsonObject
.
put
(
"storeId"
,
storeId
);
String
data
=
jsonObject
.
toJSONString
();
String
pageUrl
=
this
.
getPageUrl
(
AppPageType
.
MY_RELATED_RECORD
.
getCode
(),
data
);
TabHaobanWxEnterprise
tabHaobanWxEnterprise
=
wxEnterpriseMapper
.
selectByPrimaryKey
(
staffDTO
.
getWxEnterpriseId
());
String
wxUserId
=
staffDTO
.
getWxUserId
();
String
corpId
=
tabHaobanWxEnterprise
.
getCorpid
();
String
name
=
staffDTO
.
getStaffName
();
if
(
content
.
length
()>
30
){
content
=
content
.
substring
(
0
,
26
);
content
=
content
+
"..."
;
}
//先发送下,试试
QywxXcxSendMessageDTO
messageDTO
=
new
QywxXcxSendMessageDTO
();
List
<
ItemDTO
>
items
=
new
ArrayList
();;
ItemDTO
dto1
=
new
ItemDTO
();
ItemDTO
dto2
=
new
ItemDTO
();
ItemDTO
dto3
=
new
ItemDTO
();
ItemDTO
dto4
=
new
ItemDTO
();
dto1
.
setKey
(
"接收人"
);
dto1
.
setValue
(
name
);
dto2
.
setKey
(
"接收事件"
);
dto2
.
setValue
(
content
);
dto3
.
setKey
(
"结果"
);
dto3
.
setValue
(
auditStatus
==
1
?
"已同意"
:
"已拒绝"
);
dto4
.
setKey
(
"理由"
);
dto4
.
setValue
(
auditReason
);
items
.
add
(
dto1
);
items
.
add
(
dto2
);
ArrayList
<
String
>
list
=
new
ArrayList
<>();
list
.
add
(
wxUserId
);
messageDTO
.
setAppid
(
config
.
getAppid
());
messageDTO
.
setUserIds
(
list
);
messageDTO
.
setPage
(
pageUrl
);
messageDTO
.
setTitle
(
messageTitle
);
messageDTO
.
setItems
(
items
);
logger
.
info
(
"发送参数为corpId============:{},suitId============:{},messageDTO============:{},"
,
corpId
,
config
.
getWxSuiteid
(),
JSONObject
.
toJSONString
(
messageDTO
));
boolean
b
=
qywxSuiteApiService
.
sendMessage
(
corpId
,
config
.
getWxSuiteid
(),
messageDTO
);
logger
.
info
(
"发送===============》{}"
,
b
);
}
//导购绑定,,审核记录,,消息发送
@Override
public
void
sendClerkBind
(
String
clerkId
,
String
clerkCode
,
int
auditStatus
,
String
auditReason
){
//TODO huang 发送申请人,我的记录页
ClerkDTO
clerk
=
clerkService
.
getclerkById
(
clerkId
);
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java
View file @
93c8c36d
...
...
@@ -261,7 +261,7 @@ public class AuditController extends WebBaseController{
audit
.
setAuditStatus
(
2
);
//发送消息
if
(
audit
.
getAuditType
()
==
AuditType
.
CLERK_BIND
.
getCode
()){
staffDepartmentRelatedApiService
.
send
ClerkBind
(
clerkId
,
clerkCode
,
auditStatus
,
auditReason
);
staffDepartmentRelatedApiService
.
send
StaffBind
(
auditStaffId
,
clerkCode
,
storeId
,
auditStatus
,
auditReason
);
}
else
if
(
audit
.
getAuditType
()
==
AuditType
.
CLERK_ADD
.
getCode
()){
staffDepartmentRelatedApiService
.
sendClerkAdd
(
enterpriseId
,
clerkCode
,
auditStatus
,
auditReason
);
}
else
if
(
audit
.
getAuditType
()
==
AuditType
.
CLERK_DEL
.
getCode
()){
...
...
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