From 0f9d91bacff24cb14d5d86ec3de0598a13f4152c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 27 十二月 2024 11:50:37 +0800
Subject: [PATCH] 修改会员等级变更

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java |   51 ++++-----------------------------------------------
 1 files changed, 4 insertions(+), 47 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index 1d15775..e533c48 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -932,6 +932,8 @@
 			appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
 			appUser.setLastShopTime(LocalDateTime.now());
 			appUserClient.editAppUserById(appUser);
+			//变更等级
+			appUserClient.vipUpgrade(appUser.getId());
 			//构建余额明细变动记录
 			BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
 			balanceChangeRecord.setAppUserId(appUser.getId());
@@ -951,8 +953,6 @@
 			orderService.updateById(order);
 			//删除购物车数据
 			this.removeBatchByIds(ids);
-			//检查消费积分满足后升级会员
-			vipUpgrade(appUser);
 		}
 		//积分支付
 		if(3 == shoppingCartPayment.getPaymentType()){
@@ -973,8 +973,8 @@
 			appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
 			appUser.setLastShopTime(LocalDateTime.now());
 			appUserClient.editAppUserById(appUser);
-			//检查消费积分满足后升级会员
-			vipUpgrade(appUser);
+			//变更等级
+			appUserClient.vipUpgrade(appUser.getId());
 
 			//构建积分流水记录
 			UserPoint userPoint = new UserPoint();
@@ -1077,47 +1077,4 @@
 	}
 
 
-	/**
-	 * 会员等级变化
-	 * @param appUser
-	 */
-	public void vipUpgrade(AppUser appUser){
-		Integer shopPoint = appUser.getShopPoint();
-		Integer vipId = appUser.getVipId();
-		//钻石会员
-		VipSetting vipSetting3 = vipSettingClient.getVipSetting(3).getData();
-		Integer vipLevelUpShopRole = vipSetting3.getVipLevelUpShopRole();
-		Integer vipLevelUpShop = vipSetting3.getVipLevelUpShop();
-		if(null != vipLevelUpShopRole && 1 == vipLevelUpShopRole && appUser.getVipId() < 3 && shopPoint >= vipLevelUpShop){
-			appUser.setVipId(3);
-			appUserClient.editAppUserById(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);
-			userChangeLogClient.saveUserChangeLog(userChangeLog);
-			return;
-		}
-		//黄金会员
-		VipSetting vipSetting2 = vipSettingClient.getVipSetting(2).getData();
-		vipLevelUpShopRole = vipSetting2.getVipLevelUpShopRole();
-		vipLevelUpShop = vipSetting2.getVipLevelUpShop();
-		if(null != vipLevelUpShopRole && 1 == vipLevelUpShopRole && appUser.getVipId() < 2 && shopPoint >= vipLevelUpShop){
-			appUser.setVipId(2);
-			appUserClient.editAppUserById(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);
-			userChangeLogClient.saveUserChangeLog(userChangeLog);
-		}
-	}
 }

--
Gitblit v1.7.1