[feat]增加首页视频、商品和用户搜索接口v1.0

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/DarrenController.java

@@ -1,16 +1,7 @@
 package com.wzj.soopin.member.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.wzj.soopin.member.domain.bo.FansBO;
-import com.wzj.soopin.member.domain.po.Fans;
-import com.wzj.soopin.member.domain.vo.FansVO;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import org.dromara.common.core.domain.R;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/FansController.java

@@ -8,7 +8,6 @@ import com.wzj.soopin.member.convert.FansConvert;
 import com.wzj.soopin.member.convert.MemberBlockConvert;
 import com.wzj.soopin.member.domain.bo.FansBO;
 import com.wzj.soopin.member.domain.po.Fans;
-import com.wzj.soopin.member.domain.po.Member;
 import com.wzj.soopin.member.domain.po.MemberBlock;
 import com.wzj.soopin.member.domain.vo.FansVO;
 import com.wzj.soopin.member.domain.vo.MemberBlockVO;
@@ -18,20 +17,12 @@ import com.wzj.soopin.member.service.IMemberService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.constant.CacheConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
-import org.dromara.common.mq.domain.MQMessage;
-import org.dromara.common.mq.enums.MessageActionEnum;
-import org.dromara.common.mq.utils.MqUtil;
-import org.dromara.common.redis.utils.RedisUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import org.apache.commons.codec.digest.DigestUtils;
 
 @Slf4j
 @RequestMapping("/ums/fans/")

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java

@@ -13,7 +13,6 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberBankController.java

@@ -2,30 +2,18 @@ package com.wzj.soopin.member.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.wzj.soopin.member.convert.FeedbackConvert;
 import com.wzj.soopin.member.convert.MemberBankConvert;
-import com.wzj.soopin.member.convert.MemberConvert;
-import com.wzj.soopin.member.domain.bo.FeedbackBO;
 import com.wzj.soopin.member.domain.bo.MemberBankBO;
-import com.wzj.soopin.member.domain.po.Feedback;
-import com.wzj.soopin.member.domain.po.Member;
 import com.wzj.soopin.member.domain.po.MemberBank;
-import com.wzj.soopin.member.domain.vo.FeedbackVO;
 import com.wzj.soopin.member.domain.vo.MemberBankVO;
-import com.wzj.soopin.member.service.IFeedbackService;
 import com.wzj.soopin.member.service.IMemberBankService;
-import com.wzj.soopin.member.service.IMemberService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import org.dromara.common.core.constant.CacheConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
-import org.dromara.common.redis.utils.RedisUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.stream.Collectors;
-
 /**
  * 用户银行卡
  */

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberCartController.java

@@ -1,7 +1,6 @@
 package com.wzj.soopin.member.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wzj.soopin.member.annotation.MemberFillMethod;

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java

@@ -5,7 +5,6 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wzj.soopin.member.convert.MemberConvert;
 import com.wzj.soopin.member.domain.bo.MemberBO;
-import com.wzj.soopin.member.domain.form.ChangeMemberStatusForm;
 import com.wzj.soopin.member.domain.po.Member;
 import com.wzj.soopin.member.domain.vo.MemberDataStatisticsVO;
 import com.wzj.soopin.member.domain.vo.MemberVO;
@@ -18,7 +17,6 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberForbiddenController.java

@@ -2,15 +2,10 @@ package com.wzj.soopin.member.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.wzj.soopin.member.convert.MemberBankConvert;
 import com.wzj.soopin.member.convert.MemberForbiddenConvert;
-import com.wzj.soopin.member.domain.bo.MemberBankBO;
 import com.wzj.soopin.member.domain.bo.MemberForbiddenBO;
-import com.wzj.soopin.member.domain.po.MemberBank;
 import com.wzj.soopin.member.domain.po.MemberForbidden;
-import com.wzj.soopin.member.domain.vo.MemberBankVO;
 import com.wzj.soopin.member.domain.vo.MemberForbiddenVO;
-import com.wzj.soopin.member.service.IMemberBankService;
 import com.wzj.soopin.member.service.IMemberForbiddenService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberMapper.java

@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.wzj.soopin.member.domain.bo.MemberBO;
 import com.wzj.soopin.member.domain.po.Member;
 import com.wzj.soopin.member.domain.vo.MemberVO;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -18,6 +21,7 @@ import java.util.List;
  * @author zcc
  */
 @InterceptorIgnore(tenantLine = "true")
+@Mapper
 public interface MemberMapper extends BaseMapper<Member> {
     /**
      * 查询会员信息列表
@@ -52,4 +56,6 @@ public interface MemberMapper extends BaseMapper<Member> {
 
     @Select("SELECT COUNT(*) FROM ums_member")
     Object countMember();
+
+    IPage<MemberVO> getMember(@Param("page") Page<Member> page, @Param("query") MemberBO query);
 }

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberService.java

@@ -1,5 +1,7 @@
 package com.wzj.soopin.member.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.wzj.soopin.member.domain.bo.MemberBO;
 import com.wzj.soopin.member.domain.form.ChangeMemberStatusForm;
@@ -70,4 +72,13 @@ public interface IMemberService extends IService<Member> {
 
 
      String updateWechat(MemberBO bo);
+
+    /**
+     * 不带租户的获取会员信息
+     *
+     * @param bo
+     * @param page
+     * @return
+     */
+     IPage<MemberVO> getMemberPageList(MemberBO bo, Page<Member> page);
 }

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java

@@ -4,7 +4,9 @@ import cn.dev33.satoken.secure.BCrypt;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.wzj.soopin.member.convert.MemberConvert;
 import com.wzj.soopin.member.domain.bo.MemberBO;
@@ -26,6 +28,7 @@ import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.redis.redis.RedisCache;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.tenant.helper.TenantHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;
@@ -58,9 +61,10 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper,Member> implemen
 
     private final MemberAccountMapper memberAccountMapper;
 
-
     private final MemberConvert memberConvert;
 
+    private final MemberMapper memberMapper;
+
     @Override
     public boolean usernameExists(String username) {
         return baseMapper.countByUsername(username) > 0; // 确保实现
@@ -279,4 +283,20 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper,Member> implemen
 
         return openId;
     }
+
+    /**
+     * 不带租户的获取会员信息
+     *
+     * @param query
+     * @param page
+     * @return
+     */
+    @Override
+    public IPage<MemberVO> getMemberPageList(MemberBO query, Page<Member> page) {
+//        int current = (int) page.getCurrent();
+//        int size = (int) page.getSize();
+//        Page<Member> pageParam = new Page<>(current, size);
+        System.out.println("aaa");
+        return memberMapper.getMember(page, query);
+    }
 }

ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml

@@ -56,4 +56,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="integral != null "> and integral = #{integral}</if>
         </where>
     </select>
+
+    <select id="getMember" resultType="com.wzj.soopin.member.domain.vo.MemberVO">
+        select * from ums_member
+        <where>
+            <if test="query.nickname != null and query.nickname != ''">
+                and nickname LIKE CONCAT('%', #{query.nickname}, '%')
+            </if>
+        </where>
+    </select>
 </mapper>