1、补充用户信息收藏字段

2、增加积分列表接口
3、商品详情权限验证调整
3、活动详情权限验证调整
4、帖子增加用户信息

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityActivityApply/controller/CommunityActivityApplyController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 活动报名表
  * @Author: jeecg-boot
- * @Date:   2025-07-28
+ * @Date:   2025-07-29
  * @Version: V1.0
  */
 @Api(tags="活动报名表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityActivityApply/entity/CommunityActivityApply.java

@@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 活动报名表
  * @Author: jeecg-boot
- * @Date:   2025-07-28
+ * @Date:   2025-07-29
  * @Version: V1.0
  */
 @Data
@@ -58,6 +58,10 @@ public class CommunityActivityApply implements Serializable {
 	@Dict(dicCode = "community_sex")
     @ApiModelProperty(value = "性别")
     private java.lang.String sex;
+	/**年龄*/
+	@Excel(name = "年龄", width = 15)
+    @ApiModelProperty(value = "年龄")
+    private java.lang.Integer age;
 	/**手机号*/
 	@Excel(name = "手机号", width = 15)
     @ApiModelProperty(value = "手机号")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityActivityApply/mapper/CommunityActivityApplyMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 活动报名表
  * @Author: jeecg-boot
- * @Date:   2025-07-28
+ * @Date:   2025-07-29
  * @Version: V1.0
  */
 public interface CommunityActivityApplyMapper extends BaseMapper<CommunityActivityApply> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityActivityApply/service/ICommunityActivityApplyService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 活动报名表
  * @Author: jeecg-boot
- * @Date:   2025-07-28
+ * @Date:   2025-07-29
  * @Version: V1.0
  */
 public interface ICommunityActivityApplyService extends IService<CommunityActivityApply> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityActivityApply/service/impl/CommunityActivityApplyServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 活动报名表
  * @Author: jeecg-boot
- * @Date:   2025-07-28
+ * @Date:   2025-07-29
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityActivityApply/vue/CommunityActivityApplyList.vue

@@ -132,6 +132,11 @@
             align:"center",
             dataIndex: 'sex_dictText'
           },
+          {
+            title:'年龄',
+            align:"center",
+            dataIndex: 'age'
+          },
           {
             title:'手机号',
             align:"center",
@@ -198,6 +203,7 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
         fieldList.push({type:'string',value:'sex',text:'性别',dictCode:'community_sex'})
+        fieldList.push({type:'int',value:'age',text:'年龄',dictCode:''})
         fieldList.push({type:'string',value:'phone',text:'手机号',dictCode:''})
         fieldList.push({type:'Text',value:'area',text:'所在地区',dictCode:''})
         fieldList.push({type:'Text',value:'address',text:'详细地址',dictCode:''})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityActivityApply/vue/modules/CommunityActivityApplyForm.vue

@@ -13,6 +13,11 @@
               <j-dict-select-tag type="list" v-model="model.sex" dictCode="community_sex" placeholder="请选择性别" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="年龄" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="age">
+              <a-input-number v-model="model.age" placeholder="请输入年龄" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
               <a-input v-model="model.phone" placeholder="请输入手机号"  ></a-input>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityActivityApply/vue3/CommunityActivityApply.data.ts

@@ -14,6 +14,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'sex_dictText'
    },
+   {
+    title: '年龄',
+    align:"center",
+    dataIndex: 'age'
+   },
    {
     title: '手机号',
     align:"center",
@@ -63,6 +68,11 @@ export const formSchema: FormSchema[] = [
         dictCode:"community_sex"
      },
   },
+  {
+    label: '年龄',
+    field: 'age',
+    component: 'InputNumber',
+  },
   {
     label: '手机号',
     field: 'phone',

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityPost/entity/CommunityPost.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -68,4 +69,8 @@ public class CommunityPost implements Serializable {
     @TableField(exist = false)
     List<CommunityComment> communityCommentList;
 
+    //用户信息
+    @TableField(exist = false)
+    HanHaiMember member;
+
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-07-22
+ * @Date:   2025-07-29
  * @Version: V1.0
  */
 @Api(tags="han_hai_member")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -20,7 +21,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-07-22
+ * @Date:   2025-07-29
  * @Version: V1.0
  */
 @Data
@@ -87,7 +88,8 @@ public class HanHaiMember implements Serializable {
     @ApiModelProperty(value = "店铺名称备注")
     private java.lang.String shopName;
 	/**角色*/
-	@Excel(name = "角色", width = 15)
+	@Excel(name = "角色", width = 15, dicCode = "community_role")
+	@Dict(dicCode = "community_role")
     @ApiModelProperty(value = "角色")
     private java.lang.String role;
 	/**ID标识号码*/
@@ -200,4 +202,12 @@ public class HanHaiMember implements Serializable {
 	@Excel(name = "是否分销商", width = 15)
     @ApiModelProperty(value = "是否分销商")
     private java.lang.String isDai;
+
+    //积分排名
+    @TableField(exist = false)
+    int rank;
+
+    //活动收藏数量
+    @TableField(exist = false)
+    int collectionNum;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-07-22
+ * @Date:   2025-07-29
  * @Version: V1.0
  */
 public interface HanHaiMemberMapper extends BaseMapper<HanHaiMember> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-07-22
+ * @Date:   2025-07-29
  * @Version: V1.0
  */
 public interface IHanHaiMemberService extends IService<HanHaiMember> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-07-22
+ * @Date:   2025-07-29
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue

@@ -99,6 +99,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import HanHaiMemberModal from './modules/HanHaiMemberModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'HanHaiMemberList',
@@ -164,7 +165,7 @@
           {
             title:'角色',
             align:"center",
-            dataIndex: 'role'
+            dataIndex: 'role_dictText'
           },
           {
             title:'ID标识号码',
@@ -346,7 +347,7 @@
         fieldList.push({type:'string',value:'password',text:'登录密码',dictCode:''})
         fieldList.push({type:'string',value:'passwordSalt',text:'登录盐',dictCode:''})
         fieldList.push({type:'string',value:'shopName',text:'店铺名称备注',dictCode:''})
-        fieldList.push({type:'string',value:'role',text:'角色',dictCode:''})
+        fieldList.push({type:'string',value:'role',text:'角色',dictCode:'community_role'})
         fieldList.push({type:'string',value:'cardId',text:'ID标识号码',dictCode:''})
         fieldList.push({type:'string',value:'frozenFlag',text:'是否冻结',dictCode:''})
         fieldList.push({type:'string',value:'deleteFlag',text:'是否删除',dictCode:''})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue

@@ -45,7 +45,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="角色" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="role">
-              <a-input v-model="model.role" placeholder="请输入角色"  ></a-input>
+              <j-dict-select-tag type="list" v-model="model.role" dictCode="community_role" placeholder="请选择角色" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts

@@ -47,7 +47,7 @@ export const columns: BasicColumn[] = [
    {
     title: '角色',
     align:"center",
-    dataIndex: 'role'
+    dataIndex: 'role_dictText'
    },
    {
     title: 'ID标识号码',
@@ -236,7 +236,10 @@ export const formSchema: FormSchema[] = [
   {
     label: '角色',
     field: 'role',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"community_role"
+     },
   },
   {
     label: 'ID标识号码',

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/communityController/ScoreController.java

@@ -32,4 +32,11 @@ public class ScoreController {
     public Result<?> queryScoreList(@RequestHeader("X-Access-Token") String token, CommunityScore communityScore, PageBean pageBean){
         return scoreService.queryScoreList(token, communityScore, pageBean);
     }
+
+    //首页-积分排行榜
+    @ApiOperation(value="首页-积分排行榜", notes="首页-积分排行榜")
+    @RequestMapping(value = "/queryScoreRank", method = {RequestMethod.POST})
+    public Result<?> queryScoreRank(String token, PageBean pageBean){
+        return scoreService.queryScoreRank(token, pageBean);
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ScoreService.java

@@ -13,4 +13,7 @@ public interface ScoreService {
     //可用积分-获取积分明细列表
     public Result<?> queryScoreList(String token, CommunityScore communityScore, PageBean pageBean);
 
+    //首页-积分排行榜
+    public Result<?> queryScoreRank(String token, PageBean pageBean);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ActivityServiceImpl.java

@@ -116,6 +116,11 @@ public class ActivityServiceImpl implements ActivityService {
     @Override
     public Result<?> queryActivityById(String token, String activityId) {
         log.info("开始查询活动信息详情");
+        //权限验证
+        HanHaiMember hanHaiMember = null;
+        if(StringUtils.isNotEmpty(token)){
+            hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        }
         //返回信息
         String massege = "";
 
@@ -132,8 +137,7 @@ public class ActivityServiceImpl implements ActivityService {
             //判断活动是否被收藏/已报名
             one.setIsCollection(0);
             one.setIsApply(0);
-            if(StringUtils.isNotEmpty(token)){
-                HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+            if(null != hanHaiMember){
                 //1、判断活动是否被收藏
                 CommunityActivityCollection collection = communityActivityCollectionService
                         .lambdaQuery()
@@ -347,6 +351,7 @@ public class ActivityServiceImpl implements ActivityService {
             CommunityActivity activity = communityActivityService
                     .lambdaQuery()
                     .eq(CommunityActivity::getStatus, 0)
+                    .eq(CommunityActivity::getId, communityActivityApply.getActivityId())
                     .one();
             if(null == activity){
                 log.info("活动不存在，请检查活动id：{}", communityActivityApply.getActivityId());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/CommunityServiceImpl.java

@@ -17,6 +17,7 @@ import org.jeecg.modules.communityPost.entity.CommunityPost;
 import org.jeecg.modules.communityPost.service.ICommunityCommentService;
 import org.jeecg.modules.communityPost.service.ICommunityPostService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -37,6 +38,9 @@ public class CommunityServiceImpl implements CommunityService {
     //评论信息
     @Resource
     private ICommunityCommentService communityCommentService;
+    //评论信息
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
     /******************************************************************************************************************/
 
     //获取帖子列表
@@ -70,6 +74,7 @@ public class CommunityServiceImpl implements CommunityService {
             //获取帖子列表
             pageList = query.page(page);
 
+            //添加帖子评论信息
             List<CommunityComment> communityCommentList = communityCommentService.list();
             for (CommunityPost record : pageList.getRecords()) {
                 List<CommunityComment> commentList = new ArrayList<>();
@@ -81,8 +86,17 @@ public class CommunityServiceImpl implements CommunityService {
                 record.setCommunityCommentList(commentList);
             }
 
+            //添加帖子用户信息
+            for (CommunityPost record : pageList.getRecords()) {
+                HanHaiMember member = hanHaiMemberService.getById(record.getUserId());
+                if(null != member){
+                    record.setMember(member);
+                }
+            }
+
+
             log.info("帖子列表查询结束");
-            return Result.OK("帖子图列表", pageList);
+            return Result.OK("帖子列表", pageList);
         }catch (Exception e){
             log.info("帖子列表查询失败");
             e.printStackTrace();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/GoodsServiceImpl.java

@@ -124,6 +124,11 @@ public class GoodsServiceImpl implements GoodsService {
     @Override
     public Result<?> queryGoodsById(String token, String goodsId) {
         log.info("开始查询商品信息详情");
+        //权限验证
+        HanHaiMember hanHaiMember = null;
+        if(StringUtils.isNotEmpty(token)){
+            hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        }
         //返回信息
         String massege = "";
 
@@ -140,8 +145,7 @@ public class GoodsServiceImpl implements GoodsService {
 
             //2、判断商品是否被收藏
             one.setIsCollection(0);
-            if(StringUtils.isNotEmpty(token)){
-                HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+            if(null != hanHaiMember){
                 CommunityGoodsCollection collection = communityGoodsCollectionService
                         .lambdaQuery()
                         .eq(CommunityGoodsCollection::getUserId, hanHaiMember.getId())

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ScoreServiceImpl.java

@@ -15,6 +15,8 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 @Slf4j
@@ -80,4 +82,63 @@ public class ScoreServiceImpl implements ScoreService {
             return Result.error("积分列表查询失败");
         }
     }
+
+    //获取积分排行榜
+    @Override
+    public Result<?> queryScoreRank(String token, PageBean pageBean) {
+        log.info("开始查询积分排行榜信息");
+        HanHaiMember hanHaiMember = null;
+        if(StringUtils.isNotEmpty(token)){
+            hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        }
+
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<HanHaiMember> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<HanHaiMember> query = null;
+        //返回信息
+        Page<HanHaiMember> pageList = null;
+        Map<String, Object> map = new HashMap<>();
+
+        try{
+            //分页
+            page = new Page<HanHaiMember>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = hanHaiMemberService
+                    .lambdaQuery();
+
+            //组装查询条件
+
+            //按照创建时间降序排列
+            query.orderByDesc(HanHaiMember::getScore);
+
+            //获取积分信息
+            pageList = query.page(page);
+
+            //添加排名
+            int rank = 1;
+            //我的积分排名
+            if(null != hanHaiMember){
+                map.put("myScore", hanHaiMember);
+            }
+
+            //积分排名列表
+            for (HanHaiMember record : pageList.getRecords()) {
+                if(null != hanHaiMember && hanHaiMember.getId().equals(record.getId())){
+                    hanHaiMember.setRank(rank);
+                }
+                record.setRank(rank);
+                rank++;
+            }
+            map.put("scoreList",pageList);
+
+            log.info("积分信息查询结束");
+            return Result.OK("积分列表", map);
+        }catch (Exception e){
+            log.info("积分信息查询失败");
+            e.printStackTrace();
+            return Result.error("积分列表查询失败");
+        }
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java

@@ -5,11 +5,14 @@ import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.api.service.UserInfoService;
+import org.jeecg.modules.communityActivityCollection.entity.CommunityActivityCollection;
+import org.jeecg.modules.communityActivityCollection.service.ICommunityActivityCollectionService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service
 @Slf4j
@@ -22,6 +25,9 @@ public class UserInfoServiceImpl implements UserInfoService {
     //用户信息
     @Resource
     private IHanHaiMemberService hanHaiMemberService;
+    //活动收藏
+    @Resource
+    private ICommunityActivityCollectionService communityActivityCollectionService;
     /******************************************************************************************************************/
 
 //查询个人信息
@@ -33,6 +39,11 @@ public class UserInfoServiceImpl implements UserInfoService {
         //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
 
         try{
+            //收藏数量
+            List<CommunityActivityCollection> collectionList =  communityActivityCollectionService.list();
+            int collectionNum = collectionList.size();
+            hanHaiMember.setCollectionNum(collectionNum);
+
             log.info("个人信息获取成功");
             return Result.OK("个人信息", hanHaiMember);
         }catch (Exception e){