Merge remote-tracking branch 'origin/master' into master

src/main/java/org/rcisoft/business/memInfo/dao/MemInfoRepository.java

@@ -31,6 +31,21 @@ public interface MemInfoRepository extends CyBaseMapper<MemInfo> {
     */
     IPage<MemInfo> queryMemInfosPaged(CyPageInfo cyPageInfo,@Param("entity") MemInfo memInfo);
 
+    /**
+     * 查询我喜欢的会员列表
+     */
+    IPage<MemInfo> queryMeFollowPaged(CyPageInfo cyPageInfo,@Param("entity") MemInfo memInfo);
+
+    /**
+     * 查询喜欢我的会员列表
+     */
+    IPage<MemInfo> queryFollowMePaged(CyPageInfo cyPageInfo,@Param("entity") MemInfo memInfo);
+
+    /**
+     * 查询互相喜欢的会员列表
+     */
+    IPage<MemInfo> queryEachFollowPaged(CyPageInfo cyPageInfo,@Param("entity") MemInfo memInfo);
+
     /**
      * 根据roleKey查询角色
      * @param roleKey

src/main/java/org/rcisoft/business/memInfo/entity/MemInfo.java

@@ -547,16 +547,25 @@ public class MemInfo  extends CyIdIncreEntity<MemInfo> {
      /**
       * 我喜欢的数量
       */
+     @TableField(exist = false)
      private Integer meFollowCount;
 
      /**
       * 喜欢我的数量
       */
+     @TableField(exist = false)
      private Integer followMeCount;
 
      /**
       * 互相喜欢的数量
       */
+     @TableField(exist = false)
      private Integer eachFollowCount;
+
+     /**
+      * 查询类型 1：我喜欢的  2：喜欢我的  3：互相喜欢的
+      */
+     @TableField(exist = false)
+     private String queryType;
 }
 

src/main/java/org/rcisoft/business/memInfo/service/impl/MemInfoServiceImpl.java

@@ -241,6 +241,20 @@ public class MemInfoServiceImpl extends ServiceImpl<MemInfoRepository,MemInfo>
         if (StringUtils.isNotEmpty(loginUserId)){
             memInfo.setLoginUserId(Integer.valueOf(loginUserId));
         }
+        //查询我喜欢的 喜欢我的  互相喜欢的会员列表（应用于小程序端-我的）
+        if (StringUtils.isNotEmpty(memInfo.getQueryType())){
+            if (memInfo.getQueryType().equals("1")){
+                //我喜欢的
+                return baseMapper.queryMeFollowPaged(paginationUtility,memInfo);
+            } else if(memInfo.getQueryType().equals("2")){
+                //喜欢我的
+                return baseMapper.queryFollowMePaged(paginationUtility,memInfo);
+            } else if(memInfo.getQueryType().equals("3")){
+                //互相喜欢的
+                return baseMapper.queryEachFollowPaged(paginationUtility,memInfo);
+            }
+        }
+        //查询会员表集合
         return baseMapper.queryMemInfosPaged(paginationUtility,memInfo);
 
     }

src/main/resources/mapper/business/memInfo/mapper/MemInfoMapper.xml

@@ -560,6 +560,30 @@
             a.user_id = #{userId}
 
     </select>
+    <select id="queryMeFollowPaged" resultType="org.rcisoft.business.memInfo.entity.MemInfo">
+        SELECT mi.*
+        FROM opm_user_follow ouf
+             LEFT JOIN sys_user su ON su.business_id = ouf.target_id
+             LEFT JOIN mem_info mi ON mi.user_id = su.business_id
+        WHERE 1=1
+          and ouf.user_id = #{entity.loginUserId}
+    </select>
+    <select id="queryFollowMePaged" resultType="org.rcisoft.business.memInfo.entity.MemInfo">
+        SELECT mi.*
+        FROM opm_user_follow ouf
+                 LEFT JOIN sys_user su ON su.business_id = ouf.user_id
+                 LEFT JOIN mem_info mi ON mi.user_id = su.business_id
+        WHERE 1=1
+          and ouf.target_id = #{entity.loginUserId}
+    </select>
+    <select id="queryEachFollowPaged" resultType="org.rcisoft.business.memInfo.entity.MemInfo">
+        SELECT mi.*
+        FROM opm_user_follow a
+                 LEFT JOIN opm_user_follow b ON a.user_id = b.target_id and a.target_id = b.user_id
+                 LEFT JOIN mem_info mi ON mi.user_id = b.user_id
+        WHERE 1=1
+          and b.target_id = #{entity.loginUserId}
+    </select>
     <delete id="deleteFollow" parameterType="org.rcisoft.business.memInfo.entity.MemFollowDTO">
         delete from opm_user_follow
         where user_id = #{entity.userId} and target_id = #{entity.targetId}