Browse Source

红娘的积分和累积积分修改

mazhenhang 4 giờ trước cách đây
mục cha
commit
eed51e4357

+ 6 - 4
LiangZhiYUMao/pages/matchmaker-workbench/mine.vue

@@ -26,7 +26,7 @@
               <view class="level-icon"></view>
               <text class="level-name">{{ profile.levelName }}</text>
             </view>
-            <text class="points-value">{{ profile.points }}</text>
+            <text class="points-value">{{ profile.aggregateScore }}</text>
             <text class="points-label">积分</text>
           </view>
 
@@ -37,7 +37,7 @@
               <view class="progress-fill" :style="{ width: profile.levelProgress + '%' }"></view>
             </view>
             <view class="progress-values">
-              <text class="current-value">当前{{ profile.points }}</text>
+              <text class="current-value">当前{{ profile.aggregateScore }}</text>
               <text class="target-value">目标{{ profile.nextLevelPoints }}</text>
             </view>
             <view class="upgrade-tip">再获得{{ profile.pointsToNextLevel }}积分即可晋升{{ profile.nextLevelName }}等级</view>
@@ -210,7 +210,8 @@ export default {
         currentLevelPoints: 0,
         nextLevelPoints: 100,
         pointsToNextLevel: 0,
-        levelProgress: 0
+        levelProgress: 0,
+		aggregateScore: 0,
       },
       // 签到相关
       isSignedToday: false,
@@ -330,7 +331,8 @@ export default {
             currentLevelPoints: matchmakerInfo.current_level_points || 0,
             nextLevelPoints: matchmakerInfo.next_level_points || 100,
             pointsToNextLevel: matchmakerInfo.points_to_next_level || 0,
-            levelProgress: matchmakerInfo.level_progress || 0
+            levelProgress: matchmakerInfo.level_progress || 0,
+			aggregateScore: matchmakerInfo.aggregate_score || 0,
           }
          
         } 

+ 4 - 0
service/homePage/src/main/java/com/zhentao/entity/Matchmaker.java

@@ -149,6 +149,10 @@ public class Matchmaker implements Serializable {
      * 点赞数
      */
     private Integer likes;
+    /**
+     * 累积总积分
+     */
+    private Long aggregateScore;
     
     /**
      * 省份名称(非数据库字段)

+ 3 - 3
service/homePage/src/main/java/com/zhentao/service/impl/MatchmakerServiceImpl.java

@@ -224,8 +224,8 @@ public class MatchmakerServiceImpl extends ServiceImpl<MatchmakerMapper, Matchma
         }
         
         // 处理积分和等级进度
-        if (vo.getPoints() != null) {
-            Integer points = vo.getPoints();
+        if (vo.getAggregateScore() != null) {
+            Integer points = vo.getAggregateScore();
             Integer level = 1; // 默认等级为青铜
             
             // 根据积分区间设置等级(历史总积分用于等级判断)
@@ -390,7 +390,7 @@ public class MatchmakerServiceImpl extends ServiceImpl<MatchmakerMapper, Matchma
         // 3. 从数据库查询最新数据
         System.out.println("❌ 从数据库查询最新红娘详情: " + cacheKey);
         MatchmakerVO matchmakerVO = matchmakerMapper.selectMatchmakerByUserId(userId);
-        
+
         if (matchmakerVO != null) {
             // 4. 处理数据
             processMatchmakerVO(matchmakerVO);

+ 3 - 1
service/homePage/src/main/java/com/zhentao/service/impl/PointsManageServiceImpl.java

@@ -105,9 +105,11 @@ public class PointsManageServiceImpl implements PointsManageService {
         // 计算新的积分值
         Integer currentPoints = matchmaker.getPoints() == null ? 0 : matchmaker.getPoints();
         Integer newPoints = currentPoints + points;
-
+        long aggregateScore = matchmaker.getAggregateScore() == null ? 0 : matchmaker.getAggregateScore();
+        long newaggregateScore = aggregateScore + points;
         // 更新红娘积分
         matchmaker.setPoints(newPoints);
+        matchmaker.setAggregateScore(newaggregateScore);
         int updateResult = matchmakerMapper.updateById(matchmaker);
         if (updateResult <= 0) {
             System.err.println("更新红娘积分失败: " + makerId);

+ 5 - 0
service/homePage/src/main/java/com/zhentao/vo/MatchmakerVO.java

@@ -1,5 +1,6 @@
 package com.zhentao.vo;
 
+import afu.org.checkerframework.checker.igj.qual.I;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -193,5 +194,9 @@ public class MatchmakerVO {
      * 当前用户是否已点赞(本周)
      */
     private Boolean hasLiked;
+    /**
+     * 累积总积分
+     */
+    private Integer aggregateScore;
 }
 

+ 2 - 1
service/homePage/src/main/resources/mapper/MatchmakerMapper.xml

@@ -122,7 +122,8 @@
     
     <!-- 根据userId查询红娘详情 -->
     <select id="selectMatchmakerByUserId" resultMap="MatchmakerVOMap">
-        SELECT 
+        SELECT
+            m.aggregate_score,
             m.matchmaker_id,
             m.real_name,
             m.username,