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 | 164 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 143 insertions(+), 21 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 d96f746..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
@@ -22,18 +22,14 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.common.redis.annotation.DistributedLock;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.feignClient.OrderClient;
import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.api.feignClient.*;
-import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.core.util.UuidUtil;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -410,6 +406,7 @@
}
userCoupon.setStartTime(start);
userCoupon.setEndTime(end);
+ userCoupon.setCouponInfo(JSON.toJSONString(couponInfo));
userCouponService.save(userCoupon);
}
}
@@ -614,6 +611,130 @@
userChangeLog.setChangeType(1);
userChangeLogService.save(userChangeLog);
return;
+ }
+ }
+ }
+
+ public void vipConsumption(Long id){
+
+ System.out.println("1111111111111111111111");
+
+ AppUser appUser = this.getById(id);
+ System.out.println("消费积分："+ appUser.getShopPoint());
+ System.out.println("返佣积分："+ appUser.getSharePoint() );
+ Integer vipId = appUser.getVipId();
+ //钻石会员
+ VipSetting vipSetting3 = vipSettingClient.getVipSetting(3).getData();
+ //消费积分满足升级
+ if(1 == vipSetting3.getVipLevelUpShopRole() && appUser.getShopPoint() >= vipSetting3.getVipLevelUpShop() && appUser.getVipId() < 3){
+ appUser.setVipId(3);
+ this.updateById(appUser);
+ //添加等级变化记录
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setDelFlag(0);
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(appUser.getId());
+ userChangeLog.setBeforeVipId(vipId);
+ userChangeLog.setAfterVipId(appUser.getVipId());
+ userChangeLog.setChangeType(1);
+ userChangeLogService.save(userChangeLog);
+ return;
+ }
+ //返佣积分满足升级
+ if(1 == vipSetting3.getVipLevelUpShareRole() && appUser.getSharePoint() >= vipSetting3.getVipLevelUpShare() && appUser.getVipId() < 3){
+ appUser.setVipId(3);
+ this.updateById(appUser);
+ //添加等级变化记录
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setDelFlag(0);
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(appUser.getId());
+ userChangeLog.setBeforeVipId(vipId);
+ userChangeLog.setAfterVipId(appUser.getVipId());
+ userChangeLog.setChangeType(1);
+ userChangeLogService.save(userChangeLog);
+ return;
+ }
+ //下级人数满足升级
+ Integer vipLevelUpNumRole = vipSetting3.getVipLevelUpNumRole();
+ Integer vipDirectNum = vipSetting3.getVipDirectNum();
+ Integer vipTeamNum = vipSetting3.getVipTeamNum();
+ if(1 == vipLevelUpNumRole && appUser.getVipId() < 3){
+ //查询直推用户达到X人或者团队人数达到X人后，可升级
+ //直推用户数
+ long count = this.count(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1).eq(AppUser::getInviteUserId, id));
+ //团队用户数
+ List<AppUser> subordinate = getSubordinate(id);
+ if(vipDirectNum <= count || vipTeamNum <= subordinate.size()){
+ appUser.setVipId(3);
+ this.updateById(appUser);
+ //添加等级变化记录
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setDelFlag(0);
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(appUser.getId());
+ userChangeLog.setBeforeVipId(vipId);
+ userChangeLog.setAfterVipId(appUser.getVipId());
+ userChangeLog.setChangeType(1);
+ userChangeLogService.save(userChangeLog);
+ return;
+ }
+ }
+
+ //黄金会员
+ VipSetting vipSetting2 = vipSettingClient.getVipSetting(2).getData();
+ //消费积分满足升级
+ if(1 == vipSetting2.getVipLevelUpShopRole() && appUser.getShopPoint() >= vipSetting2.getVipLevelUpShop() && appUser.getVipId() < 2){
+ appUser.setVipId(2);
+ this.updateById(appUser);
+ //添加等级变化记录
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setDelFlag(0);
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(appUser.getId());
+ userChangeLog.setBeforeVipId(vipId);
+ userChangeLog.setAfterVipId(appUser.getVipId());
+ userChangeLog.setChangeType(1);
+ userChangeLogService.save(userChangeLog);
+ return;
+ }
+ //返佣积分满足升级
+ if(1 == vipSetting2.getVipLevelUpShareRole() && appUser.getSharePoint() >= vipSetting2.getVipLevelUpShare() && appUser.getVipId() < 2){
+ appUser.setVipId(2);
+ this.updateById(appUser);
+ //添加等级变化记录
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setDelFlag(0);
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(appUser.getId());
+ userChangeLog.setBeforeVipId(vipId);
+ userChangeLog.setAfterVipId(appUser.getVipId());
+ userChangeLog.setChangeType(1);
+ userChangeLogService.save(userChangeLog);
+ return;
+ }
+ //下级人数满足升级
+ vipLevelUpNumRole = vipSetting2.getVipLevelUpNumRole();
+ vipDirectNum = vipSetting2.getVipDirectNum();
+ vipTeamNum = vipSetting2.getVipTeamNum();
+ if(1 == vipLevelUpNumRole && appUser.getVipId() < 2){
+ //查询直推用户达到X人或者团队人数达到X人后，可升级
+ //直推用户数
+ long count = this.count(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1).eq(AppUser::getInviteUserId, id));
+ //团队用户数
+ List<AppUser> subordinate = getSubordinate(id);
+ if(vipDirectNum <= count || vipTeamNum <= subordinate.size()){
+ appUser.setVipId(2);
+ this.updateById(appUser);
+ //添加等级变化记录
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setDelFlag(0);
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(appUser.getId());
+ userChangeLog.setBeforeVipId(vipId);
+ userChangeLog.setAfterVipId(appUser.getVipId());
+ userChangeLog.setChangeType(1);
+ userChangeLogService.save(userChangeLog);
}
}
}
@@ -920,9 +1041,9 @@
JSONObject jsonObject = (JSONObject) cacheObject;
long time = System.currentTimeMillis() - jsonObject.getInteger("time");
Integer online = jsonObject.getInteger("online");
- online += 10;
- //满足一个小时，开始发放积分，计时归0
- if(time >= 3600000L && 60 <= 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);
@@ -934,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);
@@ -954,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);
@@ -981,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