From 5db6f312ed4b686800d6d64eff2f4ae922531f40 Mon Sep 17 00:00:00 2001 From: caolin <1149034574@qq.com> Date: Wed, 23 Aug 2023 22:29:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/controller/TdMemberController.java | 3 ++- .../driver/server/service/ITdMemberService.java | 3 ++- .../service/impl/TdMemberServiceImpl.java | 17 ++++++++++++++--- src/main/resources/application.yml | 1 + 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/jwl/driver/server/controller/TdMemberController.java b/src/main/java/com/jwl/driver/server/controller/TdMemberController.java index c93fbbc..3a6ee32 100644 --- a/src/main/java/com/jwl/driver/server/controller/TdMemberController.java +++ b/src/main/java/com/jwl/driver/server/controller/TdMemberController.java @@ -5,6 +5,7 @@ import com.jwl.driver.server.dto.MemberQueryDto; import com.jwl.driver.server.exception.BusinessException; import com.jwl.driver.server.response.BaseResponse; import com.jwl.driver.server.service.ITdMemberService; +import com.jwl.driver.server.util.SecurityUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -46,6 +47,6 @@ public class TdMemberController { @PostMapping("/queryUserMember") public BaseResponse queryUserMember(@RequestBody MemberQueryDto queryDto) { log.info("获取用户会员列表======>queryDto:{}", queryDto); - return BaseResponse.success(memberService.queryUserMember(queryDto)); + return BaseResponse.success(memberService.queryUserMember(queryDto, SecurityUtil.getUserId())); } } diff --git a/src/main/java/com/jwl/driver/server/service/ITdMemberService.java b/src/main/java/com/jwl/driver/server/service/ITdMemberService.java index f334769..4092ac7 100644 --- a/src/main/java/com/jwl/driver/server/service/ITdMemberService.java +++ b/src/main/java/com/jwl/driver/server/service/ITdMemberService.java @@ -27,7 +27,8 @@ public interface ITdMemberService extends IService { /** * 获取用户开通的会员 * @param queryDto + * @param userId * @return */ - List queryUserMember(MemberQueryDto queryDto); + List queryUserMember(MemberQueryDto queryDto,Long userId); } diff --git a/src/main/java/com/jwl/driver/server/service/impl/TdMemberServiceImpl.java b/src/main/java/com/jwl/driver/server/service/impl/TdMemberServiceImpl.java index 86d13a8..661dc49 100644 --- a/src/main/java/com/jwl/driver/server/service/impl/TdMemberServiceImpl.java +++ b/src/main/java/com/jwl/driver/server/service/impl/TdMemberServiceImpl.java @@ -9,7 +9,9 @@ import com.jwl.driver.server.mapper.TdMemberMapper; import com.jwl.driver.server.service.ITdMemberService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jwl.driver.server.util.SecurityUtil; +import com.jwl.driver.server.util.TokenThreadUtil; import com.jwl.driver.server.vo.MemberVo; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.*; @@ -24,6 +26,7 @@ import java.util.stream.Collectors; * @since 2023-08-10 */ @Service +@Slf4j public class TdMemberServiceImpl extends ServiceImpl implements ITdMemberService { @Override @@ -32,7 +35,15 @@ public class TdMemberServiceImpl extends ServiceImpl i List resultList = new ArrayList<>(); //获取用户已开通且未到期的会员（即使该会员已不售卖了） - List userMemberList = queryUserMember(queryDto); + List userMemberList = new ArrayList<>(); + try { + if (StrUtil.isNotBlank(TokenThreadUtil.getToken())){ + userMemberList = queryUserMember(queryDto,SecurityUtil.getUserId()); + } + }catch (Exception e){ + log.info("===================>用户没有登录"); + } + Map userMemberMap = userMemberList.stream().collect(Collectors.toMap(MemberVo::getMemberId, v -> v, (v1, v2) -> v1)); //将用户购买的已停售但未过期的会员放在最前面 @@ -57,8 +68,8 @@ public class TdMemberServiceImpl extends ServiceImpl i } @Override - public List queryUserMember(MemberQueryDto queryDto) { - return this.getBaseMapper().queryUserMember(queryDto,SecurityUtil.getUserId()); + public List queryUserMember(MemberQueryDto queryDto,Long userId) { + return this.getBaseMapper().queryUserMember(queryDto,userId); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ca52e2a..97f1c59 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -50,6 +50,7 @@ driver: - /tdQuestion/queryQuestion - /tdQuestion/getTestQuestion - /tdQuestion/questionCategory + - /tdMember/queryMember # 需要权限校验url集合 needAuthEndPoints: