冗余代码去掉

alien-store/src/main/java/shop/alien/store/controller/ActivityConfigController.java

@@ -130,4 +130,16 @@ public class ActivityConfigController {
         UserPoint userPoint = userPointService.getPoint(userId);
         return R.data(userPoint);
     }
+
+    @ApiOperation("获取用户积分详情")
+    @ApiOperationSupport(order = 5)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "userId", value = "用户ID", dataType = "Integer", paramType = "query")
+    })
+    @GetMapping("/getUserPointDetails")
+    public R<UserPoint> getUserPointDetails(@RequestParam(required = true) Integer userId) {
+        log.info("ActivityConfigController.getUserPointDetails");
+        UserPoint userPoint = userPointService.getUserPointDetails(userId);
+        return R.data(userPoint);
+    }
 }

alien-store/src/main/java/shop/alien/store/service/UserPointService.java

@@ -12,4 +12,6 @@ public interface UserPointService extends IService<UserPoint> {
     UserPoint getPoint(Integer userId);
 
     UserPoint addPoint(Integer userId, Integer point);
+
+    UserPoint getUserPointDetails(Integer userId);
 }

alien-store/src/main/java/shop/alien/store/service/impl/LifeUserViolationServiceImpl.java

@@ -143,11 +143,8 @@ public class LifeUserViolationServiceImpl extends ServiceImpl<LifeUserViolationM
     }
 
     private LifeNotice getLifeNotice(LifeUserViolation lifeuserViolation) {
-        JSONObject data = JwtUtil.getCurrentUserInfo();
         String phoneId = null;
-//        if (data != null) {
-//            phoneId = data.getString("phone");
-//        }
+
         LifeNotice lifeNotice = new LifeNotice();
         lifeNotice.setSenderId("system");
         lifeNotice.setBusinessId(lifeuserViolation.getId());

alien-store/src/main/java/shop/alien/store/service/impl/UserPointServiceImpl.java

@@ -49,39 +49,6 @@ public class UserPointServiceImpl extends ServiceImpl<UserPointMapper, UserPoint
             userPoint.setUserPoint(0);
             userPointMapper.insert(userPoint);
         }
-
-//        int point = 0;
-//        LambdaQueryWrapper<ActivityInviteLog> activityInviteLogLambdaQueryWrapper = new LambdaQueryWrapper<>();
-//        activityInviteLogLambdaQueryWrapper.eq(ActivityInviteLog::getInviteUserId, userId);
-//        activityInviteLogLambdaQueryWrapper.eq(ActivityInviteLog::getDeleteFlag, 0);
-//        List<ActivityInviteLog> activityInviteLogList = activityInviteLogMapper.selectList(activityInviteLogLambdaQueryWrapper);
-//        int invitePoint = 0;
-//        if(com.alibaba.nacos.common.utils.CollectionUtils.isNotEmpty(activityInviteLogList)){
-//            for(ActivityInviteLog activityInviteLog : activityInviteLogList){
-//                int inviteRewardType = activityInviteLog.getInviteRewardType();
-//                if(inviteRewardType == 2 && activityInviteLog.getInviteRewardPoint() != null){
-//                    invitePoint = activityInviteLog.getInviteRewardPoint() + invitePoint;
-//                }
-//            }
-//        }
-//        point = point + invitePoint;
-//
-//        int totalPoint = 0;
-//        LambdaQueryWrapper<UserSignInRecord> userSignInRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
-//        userSignInRecordLambdaQueryWrapper.eq(UserSignInRecord::getUserId, userId);
-//        userSignInRecordLambdaQueryWrapper.eq(UserSignInRecord::getDeleteFlag, 0);
-//        userSignInRecordLambdaQueryWrapper.orderByDesc(UserSignInRecord::getSignInDate);
-//        List<UserSignInRecord> userSignInRecordList =  userSignInRecordMapper.selectList(userSignInRecordLambdaQueryWrapper);
-//        if(!CollectionUtils.isEmpty(userSignInRecordList)){
-//            totalPoint = userSignInRecordList.stream()
-//                    .mapToInt(UserSignInRecord::getPointsObtained)
-//                    .sum();
-//        }
-//        point = point + totalPoint;
-//
-//        UserPoint userPoint = new UserPoint();
-//        userPoint.setUserPoint(point);
-//        userPoint.setUserId(userId);
         return userPoint;
     }
 
@@ -106,4 +73,41 @@ public class UserPointServiceImpl extends ServiceImpl<UserPointMapper, UserPoint
         }
         return userPoint;
     }
+
+    @Override
+    public UserPoint getUserPointDetails(Integer userId) {
+        int point = 0;
+        LambdaQueryWrapper<ActivityInviteLog> activityInviteLogLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        activityInviteLogLambdaQueryWrapper.eq(ActivityInviteLog::getInviteUserId, userId);
+        activityInviteLogLambdaQueryWrapper.eq(ActivityInviteLog::getDeleteFlag, 0);
+        List<ActivityInviteLog> activityInviteLogList = activityInviteLogMapper.selectList(activityInviteLogLambdaQueryWrapper);
+        int invitePoint = 0;
+        if(com.alibaba.nacos.common.utils.CollectionUtils.isNotEmpty(activityInviteLogList)){
+            for(ActivityInviteLog activityInviteLog : activityInviteLogList){
+                int inviteRewardType = activityInviteLog.getInviteRewardType();
+                if(inviteRewardType == 2 && activityInviteLog.getInviteRewardPoint() != null){
+                    invitePoint = activityInviteLog.getInviteRewardPoint() + invitePoint;
+                }
+            }
+        }
+        point = point + invitePoint;
+
+        int totalPoint = 0;
+        LambdaQueryWrapper<UserSignInRecord> userSignInRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        userSignInRecordLambdaQueryWrapper.eq(UserSignInRecord::getUserId, userId);
+        userSignInRecordLambdaQueryWrapper.eq(UserSignInRecord::getDeleteFlag, 0);
+        userSignInRecordLambdaQueryWrapper.orderByDesc(UserSignInRecord::getSignInDate);
+        List<UserSignInRecord> userSignInRecordList =  userSignInRecordMapper.selectList(userSignInRecordLambdaQueryWrapper);
+        if(!CollectionUtils.isEmpty(userSignInRecordList)){
+            totalPoint = userSignInRecordList.stream()
+                    .mapToInt(UserSignInRecord::getPointsObtained)
+                    .sum();
+        }
+        point = point + totalPoint;
+
+        UserPoint userPoint = new UserPoint();
+        userPoint.setUserPoint(point);
+        userPoint.setUserId(userId);
+        return userPoint;
+    }
 }