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
6e6efd38
Commit
6e6efd38
authored
May 11, 2022
by
墨竹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:企微好友删除通知会员
parent
aff16916
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
28 deletions
+48
-28
TabHaobanExternalClerkRelatedMapper.java
...rvice/dao/mapper/TabHaobanExternalClerkRelatedMapper.java
+31
-13
ExternalClerkRelatedServiceImpl.java
...service/service/impl/ExternalClerkRelatedServiceImpl.java
+15
-7
ExternalClerkRelatedApiServiceImpl.java
.../service/out/impl/ExternalClerkRelatedApiServiceImpl.java
+0
-6
TabHaobanExternalClerkRelatedMapper.xml
.../resources/mapper/TabHaobanExternalClerkRelatedMapper.xml
+2
-2
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java
View file @
6e6efd38
...
...
@@ -22,7 +22,9 @@ public interface TabHaobanExternalClerkRelatedMapper {
void
delByUserIdAndExternalUserId
(
TabHaobanExternalClerkRelated
record
);
void
delByUserIdAndExternalUserIdBatch
(
@Param
(
"wxUserId"
)
String
wxUserId
,
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
,
@Param
(
"externalUserIds"
)
List
<
String
>
externalUserIds
);
void
delByUserIdAndExternalUserIdBatch
(
@Param
(
"wxUserId"
)
String
wxUserId
,
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
,
@Param
(
"externalUserIds"
)
List
<
String
>
externalUserIds
);
void
delByClerkIdAndStaffId
(
@Param
(
"clerkId"
)
String
clerkId
,
@Param
(
"staffId"
)
String
staffId
);
...
...
@@ -34,7 +36,9 @@ public interface TabHaobanExternalClerkRelatedMapper {
TabHaobanExternalClerkRelated
getByParams
(
@Param
(
"userId"
)
String
userId
,
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
,
@Param
(
"name"
)
String
name
,
@Param
(
"createTime"
)
String
createTime
);
List
<
TabHaobanExternalClerkRelated
>
listByExTernalUseridAndWxUserId
(
@Param
(
"externalUserid"
)
String
externalUserid
,
@Param
(
"userId"
)
String
wxUserId
);
List
<
TabHaobanExternalClerkRelated
>
listByExTernalUseridAndWxUserId
(
@Param
(
"externalUserid"
)
String
externalUserid
,
@Param
(
"userId"
)
String
wxUserId
,
@Param
(
"statusFlag"
)
Integer
statusFlag
);
/**
* 查询该会员该企业下的好友关系
...
...
@@ -50,16 +54,22 @@ public interface TabHaobanExternalClerkRelatedMapper {
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
,
@Param
(
"statusFlags"
)
List
<
String
>
statusFlags
);
List
<
TabHaobanExternalClerkRelated
>
listByExTernalUseridAndWxUserIdAllStatus
(
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
,
@Param
(
"externalUserid"
)
String
externalUserid
,
@Param
(
"userId"
)
String
wxUserId
);
List
<
TabHaobanExternalClerkRelated
>
listByExTernalUseridAndWxUserIdAllStatus
(
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
,
@Param
(
"externalUserid"
)
String
externalUserid
,
@Param
(
"userId"
)
String
wxUserId
);
List
<
TabHaobanExternalClerkRelated
>
listByEnterpriseIdAndDate
(
@Param
(
"enterpriseId"
)
String
enterpriseId
,
@Param
(
"date"
)
Date
date
);
List
<
TabHaobanExternalClerkRelated
>
listByEnterpriseIdAndDate
(
@Param
(
"enterpriseId"
)
String
enterpriseId
,
@Param
(
"date"
)
Date
date
);
Page
<
TabHaobanExternalClerkRelated
>
pageMemberUnionByParams
(
@Param
(
"userIdList"
)
List
<
String
>
userIdList
,
@Param
(
"sendMemberIds"
)
List
<
String
>
sendMemberIds
,
Page
<
TabHaobanExternalClerkRelated
>
pageMemberUnionByParams
(
@Param
(
"userIdList"
)
List
<
String
>
userIdList
,
@Param
(
"sendMemberIds"
)
List
<
String
>
sendMemberIds
,
@Param
(
"enterpriseId"
)
String
enterpriseId
);
List
<
TabHaobanExternalClerkRelated
>
listByWxEnterpriseIdAndWxUserId
(
@Param
(
"wxUserId"
)
String
wxUserId
,
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
);
List
<
TabHaobanExternalClerkRelated
>
listByWxEnterpriseIdAndWxUserId
(
@Param
(
"wxUserId"
)
String
wxUserId
,
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
);
List
<
TabHaobanExternalClerkRelated
>
listByWxEnterpriseIdAndWxUserIds
(
@Param
(
"userIdList"
)
List
<
String
>
userIdList
,
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
);
List
<
TabHaobanExternalClerkRelated
>
listByWxEnterpriseIdAndWxUserIds
(
@Param
(
"userIdList"
)
List
<
String
>
userIdList
,
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
);
TabHaobanExternalClerkRelated
getByMemberId
(
@Param
(
"wxUserId"
)
String
wxUserId
,
@Param
(
"memberId"
)
String
memberId
);
...
...
@@ -70,7 +80,8 @@ public interface TabHaobanExternalClerkRelatedMapper {
* @param unionId
* @return
*/
List
<
TabHaobanExternalClerkRelated
>
listExternalByUnionId
(
@Param
(
"enterpriseId"
)
String
enterpriseId
,
@Param
(
"unionId"
)
String
unionId
);
List
<
TabHaobanExternalClerkRelated
>
listExternalByUnionId
(
@Param
(
"enterpriseId"
)
String
enterpriseId
,
@Param
(
"unionId"
)
String
unionId
);
/**
* 外部联系人的unionid
...
...
@@ -79,7 +90,9 @@ public interface TabHaobanExternalClerkRelatedMapper {
* @param unionId
* @return
*/
TabHaobanExternalClerkRelated
getClerkExternalByUnionId
(
@Param
(
"enterpriseId"
)
String
enterpriseId
,
@Param
(
"clerkId"
)
String
clerkId
,
@Param
(
"unionId"
)
String
unionId
);
TabHaobanExternalClerkRelated
getClerkExternalByUnionId
(
@Param
(
"enterpriseId"
)
String
enterpriseId
,
@Param
(
"clerkId"
)
String
clerkId
,
@Param
(
"unionId"
)
String
unionId
);
/**
* @param relationKey
...
...
@@ -95,7 +108,9 @@ public interface TabHaobanExternalClerkRelatedMapper {
* @param statusFlags
* @return
*/
List
<
TabHaobanExternalClerkRelated
>
listByWxEnterpriseIdAndWxUserIdAndStatus
(
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
,
@Param
(
"wxUserId"
)
String
wxUserId
,
@Param
(
"statusFlags"
)
List
<
Integer
>
statusFlags
);
List
<
TabHaobanExternalClerkRelated
>
listByWxEnterpriseIdAndWxUserIdAndStatus
(
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
,
@Param
(
"wxUserId"
)
String
wxUserId
,
@Param
(
"statusFlags"
)
List
<
Integer
>
statusFlags
);
/**
* 触达会员 给会员发送
...
...
@@ -193,6 +208,7 @@ public interface TabHaobanExternalClerkRelatedMapper {
/**
* 查询会员在企业下的好友关系 根据会员id
*
* @param memberId
* @param enterpriseId
* @return
...
...
@@ -323,8 +339,8 @@ public interface TabHaobanExternalClerkRelatedMapper {
* @date 2022-03-11 15:21:15
*/
TabHaobanExternalClerkRelated
getByWxEnterpriseIdAndUnionId
(
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
,
@Param
(
"wxUserId"
)
String
wxUserId
,
@Param
(
"unionid"
)
String
unionid
);
@Param
(
"wxUserId"
)
String
wxUserId
,
@Param
(
"unionid"
)
String
unionid
);
/**
...
...
@@ -338,7 +354,7 @@ public interface TabHaobanExternalClerkRelatedMapper {
* @date 2022-04-15 17:12:38
*/
TabHaobanExternalClerkRelated
getByEnterpriseIdAndMemberId
(
@Param
(
"enterpriseId"
)
String
enterpriseId
,
@Param
(
"memberId"
)
String
memberId
,
@Param
(
"memberId"
)
String
memberId
,
@Param
(
"statusFlag"
)
Integer
statusFlag
);
/**
...
...
@@ -352,4 +368,5 @@ public interface TabHaobanExternalClerkRelatedMapper {
*/
int
countByMemberId
(
@Param
(
"memberId"
)
String
memberId
,
@Param
(
"enterpriseId"
)
String
enterpriseId
);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ExternalClerkRelatedServiceImpl.java
View file @
6e6efd38
...
...
@@ -76,15 +76,15 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
}
String
wxEnterpriseId
=
tabHaobanStaffs
.
get
(
0
).
getWxEnterpriseId
();
String
staffId
=
tabHaobanStaffs
.
get
(
0
).
getStaffId
();
List
<
TabHaobanStaffClerkRelation
>
tabHaobanStaffClerkRelations
=
staffClerkRelationMapper
.
lisByStaffId
(
wxEnterpriseId
,
staffId
);
if
(
CollectionUtils
.
isEmpty
(
tabHaobanStaffClerkRelations
))
{
logger
.
error
(
"找不到员工导购关联关系:staffId:{},wxEnterpriseId:{}"
,
staffId
,
wxEnterpriseId
);
return
;
}
String
enterpriseId
=
tabHaobanStaffClerkRelations
.
get
(
0
).
getEnterpriseId
();
//该企微该会员所有关联关系解除后通知会员
List
<
TabHaobanExternalClerkRelated
>
list
=
mapper
.
listByExTernalUseridAndWxEnterpriseId
(
dto
.
getExternalUserid
(),
wxEnterpriseId
,
Arrays
.
asList
(
"1"
,
"3"
,
"4"
));
if
(
CollectionUtils
.
isEmpty
(
list
))
{
List
<
TabHaobanStaffClerkRelation
>
tabHaobanStaffClerkRelations
=
staffClerkRelationMapper
.
lisByStaffId
(
wxEnterpriseId
,
staffId
);
if
(
CollectionUtils
.
isEmpty
(
tabHaobanStaffClerkRelations
))
{
logger
.
error
(
"找不到员工导购关联关系:staffId:{},wxEnterpriseId:{}"
,
staffId
,
wxEnterpriseId
);
return
;
}
String
enterpriseId
=
tabHaobanStaffClerkRelations
.
get
(
0
).
getEnterpriseId
();
//删除的好友关系
List
<
TabHaobanExternalClerkRelated
>
haobanExternalClerkRelatedList
=
mapper
.
listByExTernalUseridAndWxEnterpriseId
(
dto
.
getExternalUserid
(),
wxEnterpriseId
,
Collections
.
singletonList
(
"2"
));
for
(
TabHaobanExternalClerkRelated
externalClerkRelated
:
haobanExternalClerkRelatedList
)
{
...
...
@@ -92,6 +92,14 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
logger
.
info
(
"通知会员 删除会员后更新为非企微好友 memberId:{}"
,
memberId
);
memberApiService
.
updateMemberQywxFlag
(
enterpriseId
,
memberId
,
0
);
}
}
else
{
//删除后 每次回调会员
List
<
TabHaobanExternalClerkRelated
>
relatedList
=
mapper
.
listByExTernalUseridAndWxUserId
(
dto
.
getExternalUserid
(),
dto
.
getWxUserId
(),
2
);
for
(
TabHaobanExternalClerkRelated
externalClerkRelated
:
relatedList
)
{
String
memberId
=
externalClerkRelated
.
getMemberId
();
logger
.
info
(
"通知会员 删除会员后更新为非企微好友时间 memberId:{}"
,
memberId
);
memberApiService
.
updateMemberQywxEveryOccasion
(
enterpriseId
,
memberId
,
0
,
new
Date
());
}
}
}
...
...
@@ -138,7 +146,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
@Override
public
List
<
TabHaobanExternalClerkRelated
>
listByExTernalUseridAndWxUserId
(
String
externalUserid
,
String
wxUserId
)
{
return
mapper
.
listByExTernalUseridAndWxUserId
(
externalUserid
,
wxUserId
);
return
mapper
.
listByExTernalUseridAndWxUserId
(
externalUserid
,
wxUserId
,
1
);
}
@Override
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java
View file @
6e6efd38
...
...
@@ -306,12 +306,6 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
if
(
StringUtils
.
isBlank
(
mergeMemberId
))
{
//删除会员
tabHaobanExternalClerkRelatedMapper
.
updateStatusByMemberId
(
memberId
,
enterpriseId
);
int
count
=
tabHaobanExternalClerkRelatedMapper
.
countByMemberId
(
memberId
,
enterpriseId
);
if
(
count
==
0
)
{
log
.
info
(
"通知会员 删除会员后更新为非企微好友 memberId:{}"
,
memberId
);
//无好友关系
memberApiService
.
updateMemberQywxFlag
(
enterpriseId
,
memberId
,
0
);
}
}
else
{
//合并会员
tabHaobanExternalClerkRelatedMapper
.
updateMemberIdByMemberId
(
mergeMemberId
,
memberId
,
enterpriseId
);
...
...
haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml
View file @
6e6efd38
...
...
@@ -320,7 +320,7 @@
from tab_haoban_external_clerk_related
where wx_user_id = #{userId,jdbcType=VARCHAR}
and external_user_id = #{externalUserid}
and status_flag =
1
and status_flag =
#{statusFlag}
</select>
...
...
@@ -574,7 +574,7 @@
<update
id=
"updateStatusByMemberId"
>
UPDATE
tab_haoban_external_clerk_related
SET status_flag =
0
,
SET status_flag =
2
,
update_time = now()
where member_id = #{memberId}
and enterprise_id = #{enterpriseId}
...
...
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