Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeSignController.java

ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java

@@ -474,7 +474,7 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
             }
 
             //当前用户是否已通过当前报名
-            if(busiNoticeSignMapper.selectOne(new LambdaQueryWrapper<BusiNoticeSign>().eq(BusiNoticeSign::getNoticeId, noticeId).eq(BusiNoticeSign::getUserId, userId).eq(BusiNoticeSign::getStatus,"1").last("limit 1"))!=null){
+            if(busiNoticeSignMapper.selectOne(new LambdaQueryWrapper<BusiNoticeSign>().eq(BusiNoticeSign::getNoticeId, noticeId).eq(BusiNoticeSign::getUserId, userId).eq(BusiNoticeSign::getStatus,"02").last("limit 1"))!=null){
                 res.put("passSign",true);
             }
         }

ruoyi-admin/src/main/java/com/ruoyi/member/mapper/MemberCardMapper.java

@@ -24,4 +24,11 @@ public interface MemberCardMapper extends BaseMapper<MemberCard>
      * @return java.util.List<java.lang.String>
     **/
     List<MemberCard> selectCardIdByUserId(@Param("userId")Long userId,@Param("userType")String userType,@Param("nowDate")String nowDate);
+
+    /**
+     * 查用户某身份开通的且未过期的所有开卡记录
+     * @author vinjor-M
+     * @date 14:14 2025/4/25
+    **/
+    List<MemberCard> selectMemberCardList(@Param("userId")Long userId,@Param("userType")String userType,@Param("nowDate")String nowDate);
 }

ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCardService.java

@@ -74,4 +74,15 @@ public interface IMemberCardService extends IService<MemberCard> {
      **/
     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);
+
 }

ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCardServiceImpl.java

@@ -290,6 +290,24 @@ public class MemberCardServiceImpl extends ServiceImpl<MemberCardMapper, MemberC
 
     }
 
+    /**
+     * 查某用户某身份类型的会员卡到期时间，如果没有开通会员，那么返回null
+     *
+     * @param userId   用户id
+     * @param userType 身份类型
+     * @return java.lang.String
+     * @author vinjor-M
+     * @date 14:10 2025/4/25
+     **/
+    @Override
+    public String getUserCardEndDate(Long userId, String userType) {
+        List<MemberCard> 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            这个权益

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<MemberUserMapper, MemberU
     private ISysUserService userService;
     @Resource
     private IMemberCouponService couponService;
-
+    @Autowired
+    @Lazy
+    private IMemberCardService memberCardService;
 
     /**
      * 分页列表查询
@@ -137,6 +140,8 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
     public MemberUserVO queryByUserId(Long userId, String userType) {
         //博主，通告主基本信息
         MemberUserVO result = memberUserMapper.queryByUserId(userId, userType);
+        //查是否开通的会员以及会员到期的时间
+        result.setMemberEndDate(memberCardService.getUserCardEndDate(userId,userType));
         if ("02".equals(userType)) {
             //积分
             result.setPointsBalance(pointsService.getBloggerBalance(userId));

ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberUserVO.java

@@ -46,4 +46,6 @@ public class MemberUserVO extends MemberUser {
     String userName;
     /**类型名称*/
     String identityName;
+    /**会员到期日期*/
+    String memberEndDate;
 }

ruoyi-admin/src/main/resources/mapper/member/MemberCardMapper.xml

@@ -42,6 +42,20 @@
             AND dmc.start_date <= #{nowDate} AND dmc.end_date >= #{nowDate}
         </if>
     </select>
+    <select id="selectMemberCardList" resultType="com.ruoyi.member.domain.MemberCard">
+        SELECT
+            dmc.*
+        FROM
+            dl_member_card dmc
+                LEFT JOIN dl_base_card dbc ON dmc.card_id = dbc.id
+        WHERE dmc.user_id = #{userId}
+          AND dmc.user_type = #{userType}
+          AND dmc.end_date &gt;= #{nowDate}
+          AND dmc.del_flag = 0
+          AND dbc.is_system=0
+
+        ORDER BY dmc.end_date DESC
+    </select>
 
 
 </mapper>

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()