feat: 好友关系判定

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

@@ -401,10 +401,10 @@ public interface TabHaobanExternalClerkRelatedMapper {
 
     /**
      * 查询会员与导购的好友关系
-     * @param clerkId
+     * @param staffId
      * @param memberIds
      * @return
      */
-    List<TabHaobanExternalClerkRelated> queryClerkMemberRelations(@Param("clerkId") String clerkId, @Param("memberIds") List<String> memberIds);
+    List<TabHaobanExternalClerkRelated> queryClerkMemberRelations(@Param("staffId") String staffId, @Param("memberIds") List<String> memberIds);
 
 }
\ No newline at end of file

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

@@ -96,6 +96,6 @@ public interface ExternalClerkRelatedService {
 	 * @param memberIds
 	 * @return
 	 */
-	List<TabHaobanExternalClerkRelated> queryClerkMemberRelations(String clerkId, List<String> memberIds);
+	List<TabHaobanExternalClerkRelated> queryClerkMemberRelations(String staffId, List<String> memberIds);
 
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.common.utils.PageUtil;
+import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.service.dao.mapper.content.TabHaobanPotentialCustomerMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
 import com.gic.haoban.manage.service.entity.content.TabHaobanPotentialCustomer;
@@ -14,6 +15,7 @@ import com.gic.haoban.manage.service.pojo.qo.content.InteractRecordQO;
 import com.gic.haoban.manage.service.pojo.qo.content.PotentialCustomerQO;
 import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
 import com.gic.haoban.manage.service.service.MemberQueryService;
+import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 import com.gic.haoban.manage.service.service.content.InteractRecordService;
 import com.gic.haoban.manage.service.service.content.PotentialCustomerService;
 import com.gic.haoban.manage.service.service.content.adaptor.PotentialCustomerNotifyBuilder;
@@ -56,6 +58,8 @@ public class PotentialCustomerServiceImpl implements PotentialCustomerService {
     private ExternalClerkRelatedService externalClerkRelatedService;
     @Autowired
     MemberQueryService memberQueryService;
+    @Autowired
+    StaffClerkRelationService staffClerkRelationService;
 
 
     /**
@@ -121,7 +125,11 @@ public class PotentialCustomerServiceImpl implements PotentialCustomerService {
             log.info("按好友条件搜索 无须查询");
             return Collections.emptyMap();
         }
-        List<TabHaobanExternalClerkRelated> clerkRelateds = externalClerkRelatedService.queryClerkMemberRelations(clerkId, memberIds);
+        StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getByClerkId(clerkId);
+        if (staffClerkRelationDTO == null) {
+            return Collections.emptyMap();
+        }
+        List<TabHaobanExternalClerkRelated> clerkRelateds = externalClerkRelatedService.queryClerkMemberRelations(staffClerkRelationDTO.getStaffId(), memberIds);
         if (CollectionUtils.isEmpty(clerkRelateds)) {
             log.info("查询导购与本批次会员不存在好友关系 clerkId:{}", clerkId);
             return Collections.emptyMap();

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

@@ -504,20 +504,20 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
 
     /***
      * 查询会员与导购的关系
-     * @param clerkId
+     * @param staffId
      * @param memberIds
      * @return
      */
     @Override
-    public List<TabHaobanExternalClerkRelated> queryClerkMemberRelations(String clerkId, List<String> memberIds) {
-        if (StringUtils.isBlank(clerkId)) {
-            logger.info("查询导购与会员的关系，导购id不存在 {}", clerkId);
+    public List<TabHaobanExternalClerkRelated> queryClerkMemberRelations(String staffId, List<String> memberIds) {
+        if (StringUtils.isBlank(staffId)) {
+            logger.info("查询导购与会员的关系，staffId不存在 {}", staffId);
             return Collections.emptyList();
         }
         if (CollectionUtils.isEmpty(memberIds)) {
-            logger.info("查询导购与会员的关系，会员id数组为空 {}", clerkId);
+            logger.info("查询导购与会员的关系，会员id数组为空 {}", staffId);
             return Collections.emptyList();
         }
-        return this.mapper.queryClerkMemberRelations(clerkId, memberIds);
+        return this.mapper.queryClerkMemberRelations(staffId, memberIds);
     }
 }

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

@@ -771,7 +771,7 @@
     <select id="queryClerkMemberRelations" resultMap="BaseResultMap">
         select <include refid="Base_Column_List"/>
             from tab_haoban_external_clerk_related
-        where clerk_id = #{clerkId}
+        where staff_id = #{staffId}
         and status_flag in (1, 3, 4)
         and member_id in
             <foreach collection="memberIds" item="memberId" open="(" close=")" separator=",">

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

@@ -61,7 +61,7 @@ public class MaterialReportServiceTest {
     public void handlerMaterialWeekReportTest() {
         System.setProperty("gic.module.name", "haoban-manage3-service");
         materialReportService.handlerMaterialReport(eid, staffId, MaterialReportType.WEEK.getCode());
-        materialReportService.handlerMaterialReport(eid, staffId, MaterialReportType.MONTH.getCode());
+        //materialReportService.handlerMaterialReport(eid, staffId, MaterialReportType.MONTH.getCode());
     }
 
     @Test