fix:加好友逻辑修改

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

@@ -176,4 +176,16 @@ public interface HmQrcodeApiService {
      */
     HmClerkRelationDTO getOneHmClerkByHmId(Long hmId);
 
+
+    /**
+     * 根据活码id和staffId随机找一个
+     *
+     * @param hmId    hm id
+     * @param staffId 员工id
+     * @return {@link HmClerkRelationDTO }
+     * @author mozhu
+     * @date 2022-07-15 17:24:01
+     */
+    HmClerkRelationDTO getOneHmClerkByHmIdAndStaffId(Long hmId,String staffId);
+
 }

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

@@ -113,7 +113,7 @@ public interface TabHaobanHmClerkRelationMapper {
 
 
     /**
-     * 根据导购信息获取hmid
+     * 根据hmid 获取导购信息
      *
      * @param hmId hm id
      * @return {@link List }<{@link TabHaobanHmClerkRelation }>
@@ -122,5 +122,12 @@ public interface TabHaobanHmClerkRelationMapper {
      */
     List<TabHaobanHmClerkRelation> getHmClerkByHmId(@Param("hmId") Long hmId);
 
+    /**
+     * 根据hmid 获取导购信息
+     * @param hmId
+     * @param staffId
+     * @return
+     */
+    TabHaobanHmClerkRelation getHmClerkByHmIdAndStaffId(@Param("hmId")  Long hmId, @Param("staffId")  String staffId);
 }
 

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

@@ -121,4 +121,16 @@ public interface HmClerkRelationService {
      */
     List<HmClerkRelationBO> getHmClerkByHmId(Long hmId);
 
+
+    /**
+     * 获取导购
+     *
+     * @param hmId    hm id
+     * @param staffId 员工id
+     * @return {@link HmClerkRelationBO }
+     * @author mozhu
+     * @date 2022-07-15 17:26:53
+     */
+    HmClerkRelationBO getHmClerkByHmIdAndStaffId(Long hmId,String staffId);
+
 }

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

@@ -84,4 +84,8 @@ public class HmClerkRelationServiceImpl implements HmClerkRelationService {
         return EntityUtil.changeEntityListByJSON(HmClerkRelationBO.class,tabHaobanHmClerkRelationMapper.getHmClerkByHmId(hmId));
     }
 
+    @Override
+    public HmClerkRelationBO getHmClerkByHmIdAndStaffId(Long hmId, String staffId) {
+        return EntityUtil.changeEntityByOrika(HmClerkRelationBO.class,tabHaobanHmClerkRelationMapper.getHmClerkByHmIdAndStaffId(hmId,staffId));
+    }
 }

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

@@ -351,12 +351,16 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                     staffClerkRelationDTO = staffClerkRelationService.getBindByClerkId(hmQrcodeDTO.getClerkId(), wxEnterpriseId);
                 } else if (hmQrcodeDTO.getHmType() == 2) {
                     HmClerkRelationDTO hmClerkRelationDTO = null;
+                    //有主门店导购绑定主导购，没有主门店导购绑定第一个导购，其余随机
                     TabHaobanClerkMainStoreRelated mainStoreRelated = clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
                     if (mainStoreRelated != null) {
                         StaffClerkRelationDTO relationDTO = staffClerkRelationService.getOneBindByStoreId(staffId, mainStoreRelated.getStoreId());
                          hmClerkRelationDTO = hmQrcodeApiService.getHmClerkByHmIdAndClerkId(refId, relationDTO.getClerkId());
                         if (hmClerkRelationDTO == null) {
-                            hmClerkRelationDTO = hmQrcodeApiService.getOneHmClerkByHmId(refId);
+                            hmClerkRelationDTO = hmQrcodeApiService.getOneHmClerkByHmIdAndStaffId(refId, staffId);
+                            if (hmClerkRelationDTO == null) {
+                                hmClerkRelationDTO = hmQrcodeApiService.getOneHmClerkByHmId(refId);
+                            }
                         }
                     }  else {
                          hmClerkRelationDTO = hmQrcodeApiService.getOneHmClerkByHmId(refId);

haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmClerkRelationMapper.xml

@@ -176,5 +176,11 @@
         where hm_id = #{hmId} and status = 1
     </select>
 
+    <select id="getHmClerkByHmIdAndStaffId" resultMap="TabHaobanHmClerkRelationMap">
+        select <include refid="Base_Column_List"></include>
+        from tab_haoban_hm_clerk_relation
+        where hm_id = #{hmId} and staff_id = #{staffId} and status = 1 limit 1
+    </select>
+
 </mapper>