From 810d81a44d78bc3e7c42c2f116cc9968ab04baef Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 07 二月 2025 15:57:28 +0800
Subject: [PATCH] 修改门店首页统计bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 175 +++++++++++++++++++++++----------------------------------
1 files changed, 71 insertions(+), 104 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 bb4bdf1..c3e62b9 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
@@ -25,6 +25,7 @@
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;
@@ -111,6 +112,9 @@
private RedisTemplate redisTemplate;
@Resource
private BalancePaymentService balancePaymentService;
+
+ @Resource
+ private OrderClient orderClient;
/**
@@ -282,6 +286,12 @@
if(null != appUser1 && appUser1.getStatus() == 2){
return R.fail("手机号已注册，请直接登录！");
}
+
+ String avatar = registerAccount.getAvatar();
+ if (StringUtils.isEmpty(avatar)){
+ avatar = "http://qijishenghuiyuan.obs.cn-southwest-2.myhuaweicloud.com/admin/aedfbbb41280471f8d9fa7905298b65f.png";
+ }
+
//如果手机号已注册，但是没有微信号，则将微信号添加到已有账户上
if(null != appUser1 && StringUtils.isEmpty(appUser1.getWxOpenid())){
appUser1.setWxOpenid(openid);
@@ -289,7 +299,7 @@
appUser = appUser1;
}else if(null == appUser){
appUser = new AppUser();
- appUser.setAvatar(registerAccount.getAvatar());
+ appUser.setAvatar(avatar);
appUser.setName(registerAccount.getName());
appUser.setPhone(registerAccount.getPhone());
appUser.setWxOpenid(openid);
@@ -464,8 +474,8 @@
//获取微信推广二维码
String fileName = UUID.randomUUID() + ".jpg";
- weChatUtil.getwxacodeunlimit("pages/login/login", "id=" + appUser.getId(), EnvVersion.TRIAL, filePath + fileName);
- appUser.setQrCode(accessPath + fileName);
+ String getwxacodeunlimit = weChatUtil.getwxacodeunlimit("pages/login/login", "id=" + appUser.getId(), EnvVersion.RELEASE, filePath + fileName);
+ appUser.setQrCode(getwxacodeunlimit);
this.updateById(appUser);
}
@@ -673,7 +683,7 @@
return;
}
}
- if(appUser.getVipId() > 2){
+ if(appUser.getVipId() >= 2){
appUser.setVipId(1);
this.updateById(appUser);
//添加等级变化记录
@@ -865,7 +875,6 @@
@Override
public void unbindThePromoter() {
//注册X天后没有升级成黄金会员则自动解绑推广人
-
//解绑推广人
Set<Long> unbind_promoter = redisTemplate.opsForZSet().rangeByScore("unbind_promoter", 0, LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
if(unbind_promoter.size() > 0){
@@ -876,16 +885,21 @@
updateWrapper.set("invite_user_id", null).set("shop_id", null).eq("id", appUser.getId());
this.update(updateWrapper);
}
+ redisTemplate.opsForZSet().remove("unbind_promoter", unbind_promoter.toArray());
}
//可更换推广人
Set<Long> replaceable = redisTemplate.opsForZSet().rangeByScore("replaceable", 0, LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
if(replaceable.size() > 0){
List<AppUser> list = this.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getChangePromoter, 0)
- .eq(AppUser::getStatus, 1).in(AppUser::getId, unbind_promoter));
+ .eq(AppUser::getStatus, 1).in(AppUser::getId, replaceable));
for (AppUser appUser : list) {
- appUser.setChangePromoter(1);
- this.updateById(appUser);
+ Long data = orderClient.getOrderCountByAppUserId(appUser.getId()).getData();
+ if(data == 0L){
+ appUser.setChangePromoter(1);
+ this.updateById(appUser);
+ }
}
+ redisTemplate.opsForZSet().remove("replaceable", replaceable.toArray());
}
}
@@ -898,13 +912,20 @@
Long userid = tokenService.getLoginUserApplet().getUserid();
Object cacheObject = redisService.getCacheObject("ONLINE_" + userid);
if(null == cacheObject){
- redisService.setCacheObject("ONLINE_" + userid, System.currentTimeMillis(), 1L, TimeUnit.HOURS);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("time", System.currentTimeMillis());
+ jsonObject.put("online", 0);
+ redisService.setCacheObject("ONLINE_" + userid, jsonObject, 1L, TimeUnit.HOURS);
}else{
- Long duration = (Long) cacheObject;
- long time = (System.currentTimeMillis() - duration) / 3600000;
+ JSONObject jsonObject = (JSONObject) cacheObject;
+ long time = System.currentTimeMillis() - jsonObject.getInteger("time");
+ Integer online = jsonObject.getInteger("online");
+ online += 10;
//满足一个小时，开始发放积分，计时归0
- if(1 >= time){
- redisService.setCacheObject("ONLINE_" + userid, System.currentTimeMillis(), 1L, TimeUnit.HOURS);
+ if(time >= 3600000L && 60 <= online){
+ jsonObject.put("time", System.currentTimeMillis());
+ jsonObject.put("online", 0);
+ redisService.setCacheObject("ONLINE_" + userid, jsonObject, 1L, TimeUnit.HOURS);
AppUser appUser = this.getById(userid);
PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData();
if(null != pointSetting){
@@ -937,6 +958,9 @@
//变更等级
vipUpgrade(appUser.getId());
}
+ }else{
+ jsonObject.put("online", online);
+ redisService.setCacheObject("ONLINE_" + userid, jsonObject, 1L, TimeUnit.HOURS);
}
}
}
@@ -949,6 +973,8 @@
Set<Integer> shopIds = shopR.getData();
if (!CollectionUtils.isEmpty(shopIds)){
appUser.setShopIds(shopIds);
+ }else {
+ return new Page<>();
}
}
}
@@ -967,97 +993,33 @@
public void demotionDetection() {
//代理
List<AppUser> appUserList = new ArrayList<>();
- VipSetting vipSetting = vipSettingClient.getVipSetting(5).getData();
- List<AppUser> list = this.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getVipId, 5).eq(AppUser::getStatus, 1).eq(AppUser::getDelFlag, 0).eq(AppUser::getIsDanger, 0));
- for (AppUser appUser : list) {
- //消费积分
- List<UserPoint> list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 1).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepBuyDay() + " DAY) >= create_time"));
- int sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();
- if(sum < vipSetting.getKeepBuyPoint()){
- appUser.setIsDanger(1);
- appUserList.add(appUser);
- continue;
- }
- //返佣积分
- list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 2).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepShareDay() + " DAY) >= create_time"));
- sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();
- if(sum < vipSetting.getKeepSharePoint()){
- appUser.setIsDanger(1);
- appUserList.add(appUser);
- continue;
- }
- //门店业绩
- list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 8).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepShopDay() + " DAY) >= create_time"));
- sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();
- if(sum < vipSetting.getKeepShopPoint()){
- appUser.setIsDanger(1);
- appUserList.add(appUser);
- }
- }
- if(appUserList.size() > 0){
- this.updateBatchById(appUserList);
- }
-
- //总代
- appUserList = new ArrayList<>();
- vipSetting = vipSettingClient.getVipSetting(6).getData();
- list = this.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getVipId, 6).eq(AppUser::getStatus, 1).eq(AppUser::getDelFlag, 0).eq(AppUser::getIsDanger, 0));
- for (AppUser appUser : list) {
- //消费积分
- List<UserPoint> list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 1).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepBuyDay() + " DAY) >= create_time"));
- int sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();
- if(sum < vipSetting.getKeepBuyPoint()){
- appUser.setIsDanger(1);
- appUserList.add(appUser);
- continue;
- }
- //返佣积分
- list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 2).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepShareDay() + " DAY) >= create_time"));
- sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();
- if(sum < vipSetting.getKeepSharePoint()){
- appUser.setIsDanger(1);
- appUserList.add(appUser);
- continue;
- }
- //门店业绩
- list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 8).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepShopDay() + " DAY) >= create_time"));
- sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();
- if(sum < vipSetting.getKeepShopPoint()){
- appUser.setIsDanger(1);
- appUserList.add(appUser);
- }
- }
- if(appUserList.size() > 0){
- this.updateBatchById(appUserList);
- }
-
- //合伙人
- appUserList = new ArrayList<>();
- vipSetting = vipSettingClient.getVipSetting(7).getData();
- list = this.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getVipId, 7).eq(AppUser::getStatus, 1).eq(AppUser::getDelFlag, 0).eq(AppUser::getIsDanger, 0));
- for (AppUser appUser : list) {
- //消费积分
- List<UserPoint> list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 1).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepBuyDay() + " DAY) >= create_time"));
- int sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();
- if(sum < vipSetting.getKeepBuyPoint()){
- appUser.setIsDanger(1);
- appUserList.add(appUser);
- continue;
- }
- //返佣积分
- list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 2).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepShareDay() + " DAY) >= create_time"));
- sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();
- if(sum < vipSetting.getKeepSharePoint()){
- appUser.setIsDanger(1);
- appUserList.add(appUser);
- continue;
- }
- //门店业绩
- list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 8).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepShopDay() + " DAY) >= create_time"));
- sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();
- if(sum < vipSetting.getKeepShopPoint()){
- appUser.setIsDanger(1);
- appUserList.add(appUser);
+ for (int i = 5; i < 8; i++) {
+ VipSetting vipSetting = vipSettingClient.getVipSetting(i).getData();
+ List<AppUser> list = this.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getVipId, i).eq(AppUser::getStatus, 1).eq(AppUser::getDelFlag, 0).eq(AppUser::getIsDanger, 0));
+ for (AppUser appUser : list) {
+ //消费积分
+ List<UserPoint> list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 1).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepBuyDay() + " DAY) <= create_time"));
+ int sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();
+ if(sum < vipSetting.getKeepBuyPoint()){
+ appUser.setIsDanger(1);
+ appUserList.add(appUser);
+ continue;
+ }
+ //返佣积分
+ list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 2).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepShareDay() + " DAY) <= create_time"));
+ sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();
+ if(sum < vipSetting.getKeepSharePoint()){
+ appUser.setIsDanger(1);
+ appUserList.add(appUser);
+ continue;
+ }
+ //门店业绩
+ list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 8).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepShopDay() + " DAY) <= create_time"));
+ sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();
+ if(sum < vipSetting.getKeepShopPoint()){
+ appUser.setIsDanger(1);
+ appUserList.add(appUser);
+ }
}
}
if(appUserList.size() > 0){
@@ -1093,4 +1055,9 @@
}
}
}
+
+ @Override
+ public List<AppUser> getAppUserByPhoneNoFilter(String phone) {
+ return this.baseMapper.getAppUserByPhoneNoFilter(phone);
+ }
}
--
Gitblit v1.7.1