好办外部联系人接口时间查询

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java

@@ -420,7 +420,7 @@ public interface TabHaobanExternalClerkRelatedMapper {
      */
     void deleteByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("enterpriseIdList") List<String> enterpriseIdList);
 
-    List<TabHaobanExternalClerkRelated> getAddTimeByMemberId(@Param("memberId") String memberId, @Param("enterpriseId") String enterpriseId);
+    List<TabHaobanExternalClerkRelated> getAddTimeByMemberId(@Param("memberId") String memberId, @Param("enterpriseId") String enterpriseId,@Param("flag") String flag);
 
     /**
      * 根据外部联系人id查询memberId

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

@@ -113,7 +113,7 @@ public interface ExternalClerkRelatedService {
 	 * @param enterpriseIdList
 	 */
 	void deleteByWxEnterpriseId(String wxEnterpriseId,List<String> enterpriseIdList);
-	List<TabHaobanExternalClerkRelated> getAddTimeByMemberId(String memberId, String enterpriseId);
+	List<TabHaobanExternalClerkRelated> getAddTimeByMemberId(String memberId, String enterpriseId,String flag);
 
 	/**
 	 * 根据外部联系人id查询memberId

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

@@ -127,7 +127,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
                 logger.info("通知会员 删除会员后更新为非企微好友 memberId:{}", memberId);
 //                memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
                 // 查询好办外部联系人接口,获取最近删除的时间
-                List<TabHaobanExternalClerkRelated> memberList = this.getAddTimeByMemberId(memberId, enterpriseId);
+                List<TabHaobanExternalClerkRelated> memberList = this.getAddTimeByMemberId(memberId, enterpriseId,null);
                 Date date = new Date();
                 Date opTime = new Date(0);
                 if (CollectionUtils.isNotEmpty(memberList)){
@@ -544,8 +544,8 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     }
 
     @Override
-    public List<TabHaobanExternalClerkRelated> getAddTimeByMemberId(String memberId, String enterpriseId) {
-        return this.mapper.getAddTimeByMemberId(memberId,enterpriseId);
+    public List<TabHaobanExternalClerkRelated> getAddTimeByMemberId(String memberId, String enterpriseId,String flag) {
+        return this.mapper.getAddTimeByMemberId(memberId,enterpriseId,flag);
     }
 
     @Override

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

@@ -223,7 +223,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
                 logger.info("通知会员 删除企微好友,该会员无任何好友关系，memberId:{}", memberId);
 //                memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
                 // 查询好办外部联系人接口,获取最近删除的时间
-                List<TabHaobanExternalClerkRelated> memberList = externalClerkRelatedService.getAddTimeByMemberId(memberId, enterpriseId);
+                List<TabHaobanExternalClerkRelated> memberList = externalClerkRelatedService.getAddTimeByMemberId(memberId, enterpriseId,null);
                 Date date = new Date();
                 Date opTime = new Date(0);
                 if (CollectionUtils.isNotEmpty(memberList)){

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

@@ -737,7 +737,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         log.info("通知会员 合并会员后更新为企微好友,memberId:{}", memberId);
 //        this.memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
         // 查询好办外部联系人接口，获取最早的时间替换当前时间
-        List<TabHaobanExternalClerkRelated> memberList = externalClerkRelatedService.getAddTimeByMemberId(memberId, enterpriseId);
+        List<TabHaobanExternalClerkRelated> memberList = externalClerkRelatedService.getAddTimeByMemberId(memberId, enterpriseId,null);
         Date date = new Date();
         Date opTime = new Date(0);
         Date firstTime = new Date();
@@ -1479,7 +1479,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             this.pushTagSync(memberId, wxEnterpriseId, enterpriseId);
             log.info("通知会员 更新为企微好友 memberId:{}", memberId);
 //            memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
-            List<TabHaobanExternalClerkRelated> memberList = externalClerkRelatedService.getAddTimeByMemberId(memberId, enterpriseId);
+            List<TabHaobanExternalClerkRelated> memberList = externalClerkRelatedService.getAddTimeByMemberId(memberId, enterpriseId,"1");
             Date date = new Date();
             Date opTime = new Date(0);
             Date firstTime = new Date();

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

@@ -857,6 +857,9 @@
         WHERE
             member_id = #{memberId}
           AND enterprise_id = #{enterpriseId}
+        <if test="null != flag">
+            status_flag in (1)
+        </if>
     </select>
 
     <select id="getMemberIdByExternalId"  resultType="java.lang.String">