fix:新增查询导购和会员是否是好友关系接口bug修改

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

@@ -195,7 +195,10 @@ public interface TabHaobanExternalClerkRelatedMapper {
 	 * 根据会员id更新新老会员id
 	 *
 	 * @param memberId
-	 * @return
+	 * @param oldMemberId 老会员id
+	 * @return int
+	 * @author mozhu
+	 * @date 2021-10-21 10:22:13
 	 */
 	int updateMemberIdByMemberId(@Param("memberId") String memberId, @Param("oldMemberId") String oldMemberId);
 
@@ -212,16 +215,17 @@ public interface TabHaobanExternalClerkRelatedMapper {
 
 
 	/**
-	 * 是否是盆友
+	 * 通过会员id和员工id查询数据
 	 *
-	 * @param memberId     成员身份
-	 * @param clerkId      职员id
+	 * @param staffId      员工id
 	 * @param enterpriseId 企业标识
+	 * @param memberId     会员ID
 	 * @return {@link TabHaobanExternalClerkRelated }
 	 * @author mozhu
-	 * @date 2021-10-15 11:40:33
+	 * @date 2021-10-21 10:41:28
 	 */
-	int isFriends(@Param("memberId") String memberId,
-				  @Param("clerkId") String clerkId,
-				  @Param("enterpriseId") String enterpriseId);
+	TabHaobanExternalClerkRelated getByMemberIdAndStaffId(@Param("staffId") String staffId,
+														  @Param("enterpriseId") String enterpriseId,
+														  @Param("memberId")String memberId);
+
 }
\ No newline at end of file

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

@@ -14,7 +14,10 @@ import com.gic.haoban.manage.service.dao.mapper.TabHaobanMemberClerkChatConfigMa
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
 import com.gic.haoban.manage.service.entity.MemberClerkChatConfig;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
-import com.gic.haoban.manage.service.service.*;
+import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
+import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
+import com.gic.haoban.manage.service.service.StaffClerkBindLogService;
+import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.collections.CollectionUtils;
@@ -42,10 +45,6 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
     private ExternalClerkRelatedService externalClerkRelatedService;
 
     @Autowired
-    private StaffService staffService;
-
-
-    @Autowired
     private ClerkMainStoreRelatedService clerkMainStoreRelatedService;
 
     @Autowired
@@ -228,6 +227,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, mapper.getByClerkId(clerkId));
     }
 
+    @Override
     public StaffClerkRelationDTO getByClerkIdNoStatus(String clerkId){
         return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, mapper.getByClerkIdNoStatus(clerkId));
     }

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

@@ -14,9 +14,12 @@ import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
 import com.gic.haoban.manage.api.dto.ExternalClerkRelatedShortInfoDTO;
 import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
 import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper;
+import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
 import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
+import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
 import com.gic.haoban.manage.service.pojo.QywxTagSyncInfoPojo;
 import com.gic.mq.sdk.GicMQClient;
 import com.github.pagehelper.PageHelper;
@@ -40,6 +43,10 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     private TabHaobanExternalClerkRelatedMapper tabHaobanExternalClerkRelatedMapper;
     @Autowired
     private MemberUnionidRelatedMapper memberUnionidRelatedMapper;
+    @Autowired
+    private TabHaobanStaffClerkRelationMapper staffClerkRelationMapper;
+    @Autowired
+    private StaffMapper staffMapper;
 
     /**
      * 查询导购好友关联
@@ -236,8 +243,17 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
 
     @Override
     public boolean isFriends(String memberId, String clerkId, String enterpriseId) {
-        int friends = tabHaobanExternalClerkRelatedMapper.isFriends(memberId, clerkId, enterpriseId);
-        return friends > 0;
+        TabHaobanStaffClerkRelation staffClerkRelation = staffClerkRelationMapper.getByClerkId(clerkId);
+        if (staffClerkRelation == null) {
+            return false;
+        }
+        String staffId = staffClerkRelation.getStaffId();
+        log.info("【查询会员】staffId={},memberId={}", staffId, memberId);
+        TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getByMemberIdAndStaffId(staffId, enterpriseId, memberId);
+        if (externalClerkRelated == null) {
+            return false;
+        }
+        return externalClerkRelated.getStatusFlag() == 1;
     }
 
 }

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

@@ -3,7 +3,6 @@ package com.gic.haoban.manage.service.service.out.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.crypto.SecureUtil;
-import cn.hutool.crypto.digest.MD5;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -46,11 +45,6 @@ import com.gic.member.api.service.MemberOpenCardBusinessService;
 import com.gic.member.api.service.MemberService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
-import com.gic.search.engine.api.constant.MemberDataEnum;
-import com.gic.search.engine.api.constant.OperateEnum;
-import com.gic.search.engine.api.dto.ESResponseQueryBatch;
-import com.gic.search.engine.api.dto.dynamic.DynamicSearchDTO;
-import com.gic.search.engine.api.filter.NewNodeAddUtil;
 import com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService;
 import com.gic.wechat.api.dto.qywx.*;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
@@ -227,9 +221,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         ClerkDTO clerkDTO = clerkService.getclerkById(clerkId);
         if (clerkDTO != null) {
             Integer isManager = clerkDTO.getClerkType();
-            if (isManager != null && isManager == 1 && clerkDTO.getStatus() == 1) {
-                return true;
-            }
+            return isManager != null && isManager == 1 && clerkDTO.getStatus() == 1;
         }
         return false;
     }
@@ -954,8 +946,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
         pushTagSync(dto.getExternalUserid(), dto.getWxUserId()
                 , GicQywxSyncTypeEnum.FRIEND_TAG_SYNC.getType(), QywxSyncTaskTypeEnum.MEMBER_SYNC.getType(), wxEnterprise.getWxEnterpriseId(), null);
-
-//        qywxTagApiService.syncQywxTagToGicByExternalUserId(wxEnterprise.getWxEnterpriseId(), dto.getExternalUserid(), dto.getWxUserId());
     }
 
     @Override
@@ -964,7 +954,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         if (staff == null) {
             return null;
         }
-        log.info("【查询会员】wxUserId={},unionid={}", staff.getWxUserId(), memberId);
+        log.info("【查询会员】wxUserId={},memberId={}", staff.getWxUserId(), memberId);
         return externalClerkRelatedService.getByMemberId(staff.getWxUserId(), memberId);
     }
 

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

@@ -573,12 +573,16 @@
           and enterprise_id = #{enterpriseId}
     </update>
 
-    <select id="isFriends" resultType="int">
-        select count(*)
+
+    <select id="getByMemberIdAndStaffId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
         from tab_haoban_external_clerk_related
-        where member_id = #{memberId}
-          and enterprise_id = #{enterpriseId}
-          and clerk_id = #{clerkId}
-          and status_flag = 1
+        where
+        member_id = #{memberId}
+        and enterprise_id = #{enterpriseId}
+        AND staff_id = #{staffId}
+        AND status_flag = 1 limit 1
     </select>
+
 </mapper>
\ No newline at end of file