feat: 好友关系筛选

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/qo/content/PotentialCustomerQO.java

@@ -23,6 +23,8 @@ public class PotentialCustomerQO extends BasePageInfo {
      */
     private String wxEnterpriseId;
 
+    private String staffId;
+
     /**
      * 导购id
      */

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

@@ -75,6 +75,11 @@ public class PotentialCustomerServiceImpl implements PotentialCustomerService {
             log.info("参数缺失 {}", potentialCustomerQO.getClerkId());
             return new Page<>();
         }
+        StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getByClerkId(potentialCustomerQO.getClerkId());
+        if (staffClerkRelationDTO == null) {
+            return new Page<>();
+        }
+        potentialCustomerQO.setStaffId(staffClerkRelationDTO.getStaffId());
         PageHelper.startPage(potentialCustomerQO.getPageNum(), potentialCustomerQO.getPageSize());
         com.github.pagehelper.Page<TabHaobanPotentialCustomer> pageResult =
                 (com.github.pagehelper.Page<TabHaobanPotentialCustomer>) potentialCustomerMapper.queryPotentialCustomerList(potentialCustomerQO);
@@ -89,7 +94,7 @@ public class PotentialCustomerServiceImpl implements PotentialCustomerService {
                 .map(PotentialCustomerBO::getMemberId)
                 .distinct()
                 .collect(Collectors.toList());
-        Map<String, Integer> clerkMemberRelationMap = this.queryMemberRelation(potentialCustomerQO.getClerkId(), memberIds, potentialCustomerQO.getHasMemberRelation());
+        Map<String, Integer> clerkMemberRelationMap = this.queryMemberRelation(potentialCustomerQO.getStaffId(), memberIds, potentialCustomerQO.getHasMemberRelation());
         Map<String, String> memberExtendInfoMap = this.queryMemberExtendInfo(potentialCustomerQO.getEnterpriseId(), memberIds);
 
         // 构建是否是会员
@@ -116,22 +121,19 @@ public class PotentialCustomerServiceImpl implements PotentialCustomerService {
     /**
      * 查询与导购的关系
      *
-     * @param clerkId
+     * @param staffId
      * @param memberIds
      * @return
      */
-    private Map<String, Integer> queryMemberRelation(String clerkId, List<String> memberIds, Integer hasMemberRelation) {
+    private Map<String, Integer> queryMemberRelation(String staffId, List<String> memberIds, Integer hasMemberRelation) {
         if (hasMemberRelation != null) {
             log.info("按好友条件搜索 无须查询");
             return Collections.emptyMap();
         }
-        StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getByClerkId(clerkId);
-        if (staffClerkRelationDTO == null) {
-            return Collections.emptyMap();
-        }
-        List<TabHaobanExternalClerkRelated> clerkRelateds = externalClerkRelatedService.queryClerkMemberRelations(staffClerkRelationDTO.getStaffId(), memberIds);
+
+        List<TabHaobanExternalClerkRelated> clerkRelateds = externalClerkRelatedService.queryClerkMemberRelations(staffId, memberIds);
         if (CollectionUtils.isEmpty(clerkRelateds)) {
-            log.info("查询导购与本批次会员不存在好友关系 clerkId:{}", clerkId);
+            log.info("查询导购与本批次会员不存在好友关系 staffId:{}", staffId);
             return Collections.emptyMap();
         }
         return clerkRelateds

haoban-manage3-service/src/main/resources/mapper/content/TabHaobanPotentialCustomerMapper.xml

@@ -240,7 +240,7 @@
         select customer.*
         from tab_haoban_potential_customer customer
         <if test="hasMemberRelation != null">
-            left join tab_haoban_external_clerk_related related on customer.clerk_id = related.clerk_id and related.status_flag in (1, 3, 4) and customer.member_id = related.member_id
+            left join tab_haoban_external_clerk_related related on related.staff_id = #{staffId} and related.status_flag in (1, 3, 4) and customer.member_id = related.member_id
         </if>
         <where>
             customer.clerk_id = #{clerkId} and customer.delete_flag = 0

haoban-manage3-service/src/test/java/MaterialReportServiceTest.java

@@ -52,8 +52,8 @@ public class MaterialReportServiceTest {
 
     String eid = "ff8080815dacd3a2015dacd3ef5c0000";
     String wxEid = "ca66a01b79474c40b3e7c7f93daf1a3b";
-    String staffId = "e608b51b267e4943b87e222a343b4f25";
-//    String staffId = "866b6cbb98964fd9aa0bd9e3b58e873b";
+//    String staffId = "e608b51b267e4943b87e222a343b4f25";
+    String staffId = "fb4096b75d524c5e943c036cb4079723";
     String storeId = "ff8080816e216c04016e34294282004a";
     String clerkId = "300b60c7f8874ca2b9cc696ad6b6a480";
 

haoban-manage3-service/src/test/java/PotentialCustomerServiceTest.java

@@ -42,7 +42,7 @@ public class PotentialCustomerServiceTest {
         potentialCustomerQO.setEnterpriseId(eid);
         potentialCustomerQO.setWxEnterpriseId(wxEid);
         potentialCustomerQO.setClerkId(clerkId);
-        potentialCustomerQO.setSeeFlag(0);
+        potentialCustomerQO.setHasMemberRelation(1);
         Page<PotentialCustomerBO> customerBOPage =
                 potentialCustomerService.queryPotentialCustomerPage(potentialCustomerQO);
         System.out.println(JSON.toJSONString(customerBOPage));