From c9c63baa6aca084be7a9302f240c080c9ab1454b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:46:50 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 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 57e7593..2561d96 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;
 
 
 	/**
@@ -865,7 +869,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,6 +879,7 @@
 				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));
@@ -883,9 +887,13 @@
 			List<AppUser> list = this.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getChangePromoter, 0)
 					.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 == 0){
+					appUser.setChangePromoter(1);
+					this.updateById(appUser);
+				}
 			}
+			redisTemplate.opsForZSet().remove("replaceable", replaceable.toArray());
 		}
 	}
 	

--
Gitblit v1.7.1