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

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ExternalClerkRelatedServiceImpl.java

@@ -91,6 +91,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
                 String memberId = externalClerkRelated.getMemberId();
                 logger.info("通知会员 删除会员后更新为非企微好友 memberId:{}", memberId);
                 memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
+                memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 0, new Date());
             }
         } else {
             //删除后 每次回调会员
@@ -98,7 +99,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
             for (TabHaobanExternalClerkRelated externalClerkRelated : relatedList) {
                 String memberId = externalClerkRelated.getMemberId();
                 logger.info("通知会员 删除会员后更新为非企微好友时间 memberId:{}", memberId);
-                memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 0, new Date());
+                memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 1, new Date());
             }
         }
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/CheckQywxSettingApiServiceImpl.java

@@ -71,7 +71,7 @@ public class CheckQywxSettingApiServiceImpl implements CheckQywxSettingApiServic
     public void saveFriendCallback(String wxEnterpriseId, ExternalUserDTO externalUserDTO, MemberUnionidRelatedDTO dto) {
         try {
             if (null == externalUserDTO) {
-                messageAlert(wxEnterpriseId, dto, "新增外部联系人，企微回调缺少必须字段");
+                messageAlert(wxEnterpriseId, dto, "好友提醒");
                 return;
             }
             CheckFriendSettingDTO friendSetting = this.getFriendSetting();

haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -314,7 +314,7 @@
         and status_flag = 1
     </select>
 
-    <select id="listByExTernalUseridAndWxUserId" resultMap="BaseResultMap" parameterType="java.lang.String">
+    <select id="listByExTernalUseridAndWxUserId" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_external_clerk_related