返回导购活码 是否是好友

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

@@ -378,7 +378,9 @@ public interface TabHaobanExternalClerkRelatedMapper {
                                         @Param("staffId") String staffId);
 
     List<String> listMemberAndClerk(@Param("memberIdList")List<String> memberIdList, @Param("clerkIdList")List<String> clerkIdList, @Param("enterpriseId")String enterpriseId);
-    
+
+    List<String> listFriendClerk(@Param("memberId") String memberId ,  @Param("clerkIdList")List<String> clerkIdList) ;
+
     int getCountExternalClerk(@Param("wxEnterpriseId") String wxEnterpriseId,
                               @Param("staffId")  String staffId,
                               @Param("statusFlags") List<Integer> statusFlags);

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

@@ -706,17 +706,29 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
             return ServiceResponse.failure("9999", "会员导购无关联成员") ; 
         }
         clerkIdList = staffClerkList.stream().map(dto->dto.getClerkId()).collect(Collectors.toList()) ;
-        List<String> friendList = this.tabHaobanExternalClerkRelatedMapper.listMemberAndClerk(Arrays.asList(memberId), clerkIdList, enterpriseId) ;
-        if(CollectionUtils.isNotEmpty(friendList)) {
+        String mainClerkId = member.getMainClerkId();
+        if(StringUtils.isNotBlank(mainClerkId)) {
+            clerkIdList.add(mainClerkId);
+        }
+        List<String> friendClerkList = this.tabHaobanExternalClerkRelatedMapper.listFriendClerk(memberId,clerkIdList) ;
+        if(CollectionUtils.isNotEmpty(friendClerkList)) {
             log.info("已存在好友");
-            // return ServiceResponse.failure("1000", "已存在好友") ;
+        }else {
+            friendClerkList = new ArrayList<>() ;
         }
-        String mainClerkId = member.getMainClerkId();
         String mainStoreId = member.getMainStoreId();
         // 服务门店
         log.info("memberId={},主导购={}",memberId,mainClerkId);
         if (StringUtils.isNotBlank(mainClerkId)) {
-            clerkIdList.add(mainClerkId);
+            if(friendClerkList.contains(mainClerkId)) {
+                hm = this.hmQrcodeService.queryByClerkId(mainClerkId, wxEnterpriseId, 1);
+                if(null != hm) {
+                    retDTO.setHmId(hm.getHmId());
+                    retDTO.setHmQrcode(hm.getWxQrcode());
+                    retDTO.setQwFriendFlag(1);
+                    return ServiceResponse.success(retDTO);
+                }
+            }
             hm = this.getHmFromClerk(mainClerkId, wxEnterpriseId, memberId, enterpriseId);
             if (null != hm) {
                 log.info("获取服务导购活码,mainClerkId={}", mainClerkId);
@@ -731,6 +743,15 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                 if (StringUtils.isNotBlank(mainStoreId) && mainStoreId.equals(item.getStoreIdRel())) {
                     continue;
                 }
+                if(friendClerkList.contains(clerkId)) {
+                    hm = this.hmQrcodeService.queryByClerkId(clerkId, wxEnterpriseId, 1);
+                    if(null != hm) {
+                        retDTO.setHmId(hm.getHmId());
+                        retDTO.setHmQrcode(hm.getWxQrcode());
+                        retDTO.setQwFriendFlag(1);
+                        return ServiceResponse.success(retDTO);
+                    }
+                }
                 hm = this.getHmFromClerk(clerkId, wxEnterpriseId, memberId, enterpriseId);
                 if (null != hm) {
                     log.info("获取导购活码,clerkId={}", clerkId);
@@ -762,11 +783,6 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                     retDTO.setHmQrcode(addResp.getResult());
                 }
             }
-            String staffId = hm.getStaffId() ;
-            TabHaobanExternalClerkRelated related = tabHaobanExternalClerkRelatedMapper.getByMemberId(staffId, memberId) ;
-            if(null != related) {
-                retDTO.setQwFriendFlag(1);
-            }
         }
         // 生成动态活码
         log.info("活码数据返回={}", JSON.toJSONString(retDTO));

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

@@ -773,6 +773,17 @@
         AND status_flag = 1 
     </select>
 
+    <select id="listFriendClerk"   resultType="java.lang.String">
+        select clerk_id
+        from tab_haoban_external_clerk_related
+        where member_id  = #{memberId}
+        and clerk_id in
+        <foreach collection="clerkIdList" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        AND status_flag = 1
+    </select>
+
     <select id="getCountExternalClerk" resultType="java.lang.Integer">
         select count(*)
         from tab_haoban_external_clerk_related