From c28349d68eb95d6b4d8a379ab838635b430985c5 Mon Sep 17 00:00:00 2001 From: Vinjor Date: Fri, 25 Apr 2025 15:59:44 +0800 Subject: [PATCH] 1 --- .../ruoyi/member/mapper/MemberCardMapper.java | 7 +++++++ .../member/service/IMemberCardService.java | 11 +++++++++++ .../service/impl/MemberCardServiceImpl.java | 18 ++++++++++++++++++ .../service/impl/MemberUserServiceImpl.java | 7 ++++++- .../java/com/ruoyi/member/vo/MemberUserVO.java | 2 ++ .../mapper/member/MemberCardMapper.xml | 14 ++++++++++++++ .../ruoyi/framework/config/SecurityConfig.java | 1 + 7 files changed, 59 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/mapper/MemberCardMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/member/mapper/MemberCardMapper.java index ff9b40d..78e9ec3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/mapper/MemberCardMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/mapper/MemberCardMapper.java @@ -24,4 +24,11 @@ public interface MemberCardMapper extends BaseMapper * @return java.util.List **/ List selectCardIdByUserId(@Param("userId")Long userId,@Param("userType")String userType,@Param("nowDate")String nowDate); + + /** + * 查用户某身份开通的且未过期的所有开卡记录 + * @author vinjor-M + * @date 14:14 2025/4/25 + **/ + List selectMemberCardList(@Param("userId")Long userId,@Param("userType")String userType,@Param("nowDate")String nowDate); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCardService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCardService.java index 8ead7dd..ad8cefe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCardService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCardService.java @@ -74,4 +74,15 @@ public interface IMemberCardService extends IService { **/ void dealMemberRights(Long userId,String noticeId,String rightsCode,Integer deplete) throws Exception; + /** + * 查某用户某身份类型的会员卡到期时间，如果没有开通会员，那么返回null + * + * @author vinjor-M + * @date 14:10 2025/4/25 + * @param userId 用户id + * @param userType 身份类型 + * @return java.lang.String + **/ + String getUserCardEndDate(Long userId,String userType); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCardServiceImpl.java index 2bff09e..465ba2b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCardServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCardServiceImpl.java @@ -290,6 +290,24 @@ public class MemberCardServiceImpl extends ServiceImpl memberCardList = memberCardMapper.selectMemberCardList(userId,userType,DateUtil.formatDateTime(new Date())); + if(memberCardList.isEmpty()){ + return null; + } + return DateUtil.formatDate(memberCardList.get(0).getEndDate()); + } + /** * @param memberRightsMap 会员权益map * @param item 这个权益 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java index f01213d..47f1248 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java @@ -27,6 +27,7 @@ import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.service.ISysUserService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -64,7 +65,9 @@ public class MemberUserServiceImpl extends ServiceImpl + \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index dde0769..6246bf1 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -114,6 +114,7 @@ public class SecurityConfig requests.antMatchers("/login","/wxLogin", "/register", "/captchaImage").permitAll() //相关配置参数可匿名访问 .antMatchers("/base/config/getConfigByCode").permitAll() + .antMatchers("/base/category/getByCodeInfo").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()