From d3e9a09cb54017a8063e5bfe3ace5012f66f3130 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 25 三月 2025 18:34:34 +0800
Subject: [PATCH] 修改统计bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
index 26825a6..7ce7769 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -1041,9 +1041,9 @@
JSONObject jsonObject = (JSONObject) cacheObject;
long time = System.currentTimeMillis() - jsonObject.getInteger("time");
Integer online = jsonObject.getInteger("online");
- online += 10;
- //满足一个小时，开始发放积分，计时归0
- if(time >= 60000 && 1 <= online){
+ online++;
+ //时间满足1小时，并且次数记录满足6次（10分钟记录一次）
+ if(time >= 3600000 && 6 <= online){
jsonObject.put("time", System.currentTimeMillis());
jsonObject.put("online", 0);
redisService.setCacheObject("ONLINE_" + userid, jsonObject, 1L, TimeUnit.HOURS);
@@ -1055,18 +1055,19 @@
if(1 == pointSetting.getWorkPointOpen()){
hourPoint1 = new BigDecimal(hourPoint).multiply(pointSetting.getWorkPoint().divide(new BigDecimal(100))).intValue();
}
- Integer lavePoint = appUser.getLavePoint();
- appUser.setTotalPoint(appUser.getTotalPoint() + hourPoint);
- appUser.setLavePoint(appUser.getLavePoint() + hourPoint);
- appUser.setAvailablePoint(appUser.getAvailablePoint() + hourPoint1);
- appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + hourPoint1);
- if(null != pointSetting && 1 == pointSetting.getWorkPointGift()){
- appUser.setTransferablePoint(appUser.getTransferablePoint() + hourPoint1);
- }
- appUser.setTotalHourPoint(appUser.getTotalHourPoint() + hourPoint);
- this.updateById(appUser);
//添加积分变动记录
if(hourPoint > 0){
+ Integer lavePoint = appUser.getLavePoint();
+ appUser.setTotalPoint(appUser.getTotalPoint() + hourPoint);
+ appUser.setLavePoint(appUser.getLavePoint() + hourPoint);
+ appUser.setAvailablePoint(appUser.getAvailablePoint() + hourPoint1);
+ appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + hourPoint1);
+ if(null != pointSetting && 1 == pointSetting.getWorkPointGift()){
+ appUser.setTransferablePoint(appUser.getTransferablePoint() + hourPoint1);
+ }
+ appUser.setTotalHourPoint(appUser.getTotalHourPoint() + hourPoint);
+ this.updateById(appUser);
+
UserPoint userPoint = new UserPoint();
userPoint.setType(6);
userPoint.setHistoricalPoint(lavePoint);
@@ -1075,9 +1076,9 @@
userPoint.setCreateTime(LocalDateTime.now());
userPoint.setAppUserId(appUser.getId());
userPointService.save(userPoint);
+ //变更等级
+ vipUpgrade(appUser.getId());
}
- //变更等级
- vipUpgrade(appUser.getId());
}
}else{
jsonObject.put("online", online);
@@ -1102,8 +1103,8 @@
return appUserMapper.getAppuserPage(new Page<>(pageNum, pageSize), appUser, shopId, userId);
}
@Override
- public IPage<AppUser> getAppuserPage1(Integer pageNum, Integer pageSize, AppUser appUser,Integer objectId,List<Long> userIds) {
- return appUserMapper.getAppuserPage1(new Page<>(pageNum, pageSize), appUser,objectId,userIds);
+ public IPage<AppUser> getAppuserPage1(Integer pageNum, Integer pageSize, AppUser appUser,List<Long> userIds) {
+ return appUserMapper.getAppuserPage1(new Page<>(pageNum, pageSize), appUser,userIds);
}
--
Gitblit v1.7.1