Commit a138d669 by 徐高华

Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

parents 13e4adf9 383ac62a
...@@ -91,6 +91,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ ...@@ -91,6 +91,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
String memberId = externalClerkRelated.getMemberId(); String memberId = externalClerkRelated.getMemberId();
logger.info("通知会员 删除会员后更新为非企微好友 memberId:{}", memberId); logger.info("通知会员 删除会员后更新为非企微好友 memberId:{}", memberId);
memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0); memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 0, new Date());
} }
} else { } else {
//删除后 每次回调会员 //删除后 每次回调会员
...@@ -98,7 +99,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ ...@@ -98,7 +99,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
for (TabHaobanExternalClerkRelated externalClerkRelated : relatedList) { for (TabHaobanExternalClerkRelated externalClerkRelated : relatedList) {
String memberId = externalClerkRelated.getMemberId(); String memberId = externalClerkRelated.getMemberId();
logger.info("通知会员 删除会员后更新为非企微好友时间 memberId:{}", memberId); logger.info("通知会员 删除会员后更新为非企微好友时间 memberId:{}", memberId);
memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 0, new Date()); memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 1, new Date());
} }
} }
} }
......
...@@ -71,7 +71,7 @@ public class CheckQywxSettingApiServiceImpl implements CheckQywxSettingApiServic ...@@ -71,7 +71,7 @@ public class CheckQywxSettingApiServiceImpl implements CheckQywxSettingApiServic
public void saveFriendCallback(String wxEnterpriseId, ExternalUserDTO externalUserDTO, MemberUnionidRelatedDTO dto) { public void saveFriendCallback(String wxEnterpriseId, ExternalUserDTO externalUserDTO, MemberUnionidRelatedDTO dto) {
try { try {
if (null == externalUserDTO) { if (null == externalUserDTO) {
messageAlert(wxEnterpriseId, dto, "新增外部联系人,企微回调缺少必须字段"); messageAlert(wxEnterpriseId, dto, "好友提醒");
return; return;
} }
CheckFriendSettingDTO friendSetting = this.getFriendSetting(); CheckFriendSettingDTO friendSetting = this.getFriendSetting();
......
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
and status_flag = 1 and status_flag = 1
</select> </select>
<select id="listByExTernalUseridAndWxUserId" resultMap="BaseResultMap" parameterType="java.lang.String"> <select id="listByExTernalUseridAndWxUserId" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related from tab_haoban_external_clerk_related
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment