Merge branch 'fixbug_0706' into developer

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

@@ -158,6 +158,17 @@ public interface ExternalClerkRelatedApiService {
     @Deprecated
     List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberId(String memberId);
 
+
+    /**
+     * 通过会员id查询好友门店id
+     *
+     * @param memberId 成员身份
+     * @return {@link List }<{@link String }>
+     * @author mozhu
+     * @date 2022-07-06 14:39:28
+     */
+    List<String> listStoreIdByMemberId(String memberId);
+
     /**
      * 获取该企业会员下的关联关系列表
      *

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

@@ -218,6 +218,16 @@ public interface TabHaobanExternalClerkRelatedMapper {
                                                        @Param("enterpriseId") String enterpriseId);
 
     /**
+     * 通过会员id查询门店id
+     *
+     * @param memberId 成员身份
+     * @return {@link List }<{@link String }>
+     * @author mozhu
+     * @date 2022-07-06 14:40:15
+     */
+    List<String> listStoreIdByMemberId(@Param("memberId") String memberId);
+
+    /**
      * 查询会员在企业下的好友关系 根据会员id
      *
      * @param wxEnterpriseId

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

@@ -301,6 +301,14 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     }
 
     @Override
+    public List<String> listStoreIdByMemberId(String memberId) {
+        if (StringUtils.isBlank(memberId)) {
+            return null;
+        }
+        return tabHaobanExternalClerkRelatedMapper.listStoreIdByMemberId(memberId);
+    }
+
+    @Override
     public void delByMemberIdAndEnterpriseId(String memberId, String enterpriseId, String mergeMemberId) {
         log.info("删除会员或者合并会员,memberId:{},enterpriseId:{},mergeMemberId:{}", memberId, enterpriseId, mergeMemberId);
         if (StringUtils.isBlank(mergeMemberId)) {

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

@@ -552,7 +552,14 @@
         <if test="enterpriseId != null and enterpriseId != ''">
             and enterprise_id = #{enterpriseId}
         </if>
-        group by enterprise_id,wx_enterprise_id
+    </select>
+
+    <select id="listStoreIdByMemberId" resultType="string">
+        select
+        store_id
+        from tab_haoban_external_clerk_related
+        where member_id = #{memberId}
+        and status_flag = 1
     </select>
 
     <select id="listByExternalUserId" resultMap="BaseResultMap">