refactor：注释无效代码

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

@@ -37,8 +37,10 @@ public interface ExternalClerkRelatedApiService {
      */
     List<ExternalClerkRelatedDTO> listByMemberIdAndWxEnterpriseId(String memberId, String wxEnterpriseId, String enterpriseId);
 
+    @Deprecated
     List<ExternalClerkRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId, Date date);
 
+    @Deprecated
     Page<ExternalClerkRelatedDTO> pageMemberUnionByParams(List<String> userIdList, List<String> sendMemberIds,
                                                           String enterpriseId, BasePageInfo pageInfo);
 

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

@@ -213,12 +213,15 @@ public interface TabHaobanExternalClerkRelatedMapper {
      * 根据会员id更新新老会员id
      *
      * @param memberId
-     * @param oldMemberId 老会员id
+     * @param oldMemberId  老会员id
+     * @param enterpriseId 企业标识
      * @return int
      * @author mozhu
-     * @date 2021-10-21 10:22:13
+     * @date 2022-03-24 10:28:40
      */
-    int updateMemberIdByMemberId(@Param("memberId") String memberId, @Param("oldMemberId") String oldMemberId);
+    int updateMemberIdByMemberId(@Param("memberId") String memberId,
+                                 @Param("oldMemberId") String oldMemberId,
+                                 @Param("enterpriseId") String enterpriseId);
 
     /**
      * 更新状态通过会员id

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

@@ -184,7 +184,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
                 return null;
             }
             //更新会员id
-            mapper.updateMemberIdByMemberId(memberDTO.getMemberId(), memberId);
+            mapper.updateMemberIdByMemberId(memberDTO.getMemberId(), memberId, enterpriseId);
             return memberDTO.getMemberId();
         } catch (Exception e) {
             logger.info("从搜索引擎中搜索会员数据异常, memberId : {}", memberId);

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

@@ -298,7 +298,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
             tabHaobanExternalClerkRelatedMapper.updateStatusByMemberId(memberId, enterpriseId);
         } else {
             //合并会员
-            tabHaobanExternalClerkRelatedMapper.updateMemberIdByMemberId(mergeMemberId, memberId);
+            tabHaobanExternalClerkRelatedMapper.updateMemberIdByMemberId(mergeMemberId, memberId, enterpriseId);
         }
     }
 
@@ -452,7 +452,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     @Override
     public ExternalClerkRelatedDTO getByWxEnterpriseIdAndUnionId(String wxEnterpriseId, String wxUserId, String unionid) {
         TabHaobanExternalClerkRelated related = tabHaobanExternalClerkRelatedMapper.getByWxEnterpriseIdAndUnionId(wxEnterpriseId, wxUserId, unionid);
-        return EntityUtil.changeEntityNew(ExternalClerkRelatedDTO.class,related);
+        return EntityUtil.changeEntityNew(ExternalClerkRelatedDTO.class, related);
     }
 
     /**

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

@@ -568,7 +568,7 @@
         SET member_id=#{memberId},
             status_flag = 1,
             update_time = now()
-        where member_id = #{oldMemberId}
+        where member_id = #{oldMemberId} and enterprise_id = #{enterpriseId}
     </update>
 
     <update id="updateStatusByMemberId">