From 93eae706828ce693db00bbb9c128a335ca6d4e6d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 一月 2025 15:26:37 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java |  118 +++++++++++++---------------------------------------------
 1 files changed, 27 insertions(+), 91 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 8ab7e3a..9c336ce 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
@@ -967,97 +967,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){

--
Gitblit v1.7.1