From f27e96ffed0b9e36d3968aec4197df0b289f060b Mon Sep 17 00:00:00 2001 From: haolj Date: Fri, 29 Aug 2025 19:27:44 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E5=A2=9E=E5=8A=A0=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E3=80=81=E5=95=86=E5=93=81=E5=92=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=90=9C=E7=B4=A2=E6=8E=A5=E5=8F=A3v1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/DarrenController.java | 9 -------- .../member/controller/FansController.java | 9 -------- .../controller/MemberAccountController.java | 1 - .../controller/MemberBankController.java | 12 ---------- .../controller/MemberCartController.java | 1 - .../member/controller/MemberController.java | 2 -- .../controller/MemberForbiddenController.java | 5 ----- .../soopin/member/mapper/MemberMapper.java | 6 +++++ .../soopin/member/service/IMemberService.java | 11 ++++++++++ .../service/impl/MemberServiceImpl.java | 22 ++++++++++++++++++- .../{ums => mapper/member}/MemberMapper.xml | 9 ++++++++ 11 files changed, 47 insertions(+), 40 deletions(-) rename ruoyi-modules/ruoyi-member/src/main/resources/{ums => mapper/member}/MemberMapper.xml (91%) diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/DarrenController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/DarrenController.java index 6220b3637..c7ecf94eb 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/DarrenController.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/FansController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/FansController.java index 2c51086df..3d30cd290 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/FansController.java +++ b/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/") diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java index 07c4bfc59..e80816274 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberBankController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberBankController.java index 23b485443..46022c580 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberBankController.java +++ b/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; - /** * 用户银行卡 */ diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberCartController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberCartController.java index 2058acfc0..7500abfa4 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberCartController.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java index e22e28df1..aed906f18 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberForbiddenController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberForbiddenController.java index 759af0f93..0358e9a62 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberForbiddenController.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberMapper.java index 2f43b1b5e..ddba05a28 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberMapper.java +++ b/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 { /** * 查询会员信息列表 @@ -52,4 +56,6 @@ public interface MemberMapper extends BaseMapper { @Select("SELECT COUNT(*) FROM ums_member") Object countMember(); + + IPage getMember(@Param("page") Page page, @Param("query") MemberBO query); } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberService.java index 0f0bec90a..df0aac0f6 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberService.java +++ b/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 { String updateWechat(MemberBO bo); + + /** + * 不带租户的获取会员信息 + * + * @param bo + * @param page + * @return + */ + IPage getMemberPageList(MemberBO bo, Page page); } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java index a09b57c81..cf124c115 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java +++ b/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 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 implemen return openId; } + + /** + * 不带租户的获取会员信息 + * + * @param query + * @param page + * @return + */ + @Override + public IPage getMemberPageList(MemberBO query, Page page) { +// int current = (int) page.getCurrent(); +// int size = (int) page.getSize(); +// Page pageParam = new Page<>(current, size); + System.out.println("aaa"); + return memberMapper.getMember(page, query); + } } diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml similarity index 91% rename from ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberMapper.xml rename to ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml index ce5eaece7..f0308865c 100644 --- a/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberMapper.xml +++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml @@ -56,4 +56,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and integral = #{integral} + +