From 03087dc9b9a1e3a74bf74ba06446e72a44b96e07 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 15:58:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java | 51 ++++++++++++++-------------------------------------
1 files changed, 14 insertions(+), 37 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java
index 5071a86..68bae5a 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java
@@ -34,48 +34,25 @@
@Override
public Boolean checkReadyToBeProxy(Long userId,Integer vipId) {
AppUser appUser = appUserService.getById(userId);
- VipSetting vipSetting = vipSettingService.getVipSettingById(vipId);
- if (vipSetting.getVipLevelUpShopRole() == 0){
- return false;
- }
+ // 消费积分
+ Integer shopPoint = appUser.getShopPoint();
+ // 返佣积分
+ Integer sharePoint = appUser.getSharePoint();
+ // 准代理会员设置
+ VipSetting vipSetting = vipSettingService.getVipSettingById(4);
+ // 消费积分阈值
Integer vipLevelUpShop = vipSetting.getVipLevelUpShop();
- if (appUser.getShopPoint() >= vipLevelUpShop){
- return true;
- }
+ // 返佣积分阈值
Integer vipLevelUpShare = vipSetting.getVipLevelUpShare();
- if (appUser.getSharePoint() >= vipLevelUpShare){
+ if (shopPoint >=vipLevelUpShop && sharePoint >= vipLevelUpShare){
return true;
}
-
- // 当前用户的直推用户
- List<AppUser> bottomUsers = appUserService.list(new LambdaQueryWrapper<AppUser>()
+ // 直推钻石用户数阈值
+ Integer vipDirectNum = vipSetting.getVipDirectNum();
+ // 获取用户直推钻石用户数量
+ long userDiamondsCount = appUserService.count(new LambdaQueryWrapper<AppUser>()
.eq(AppUser::getInviteUserId, userId)
- .eq(AppUser::getVipId,3));
- if (bottomUsers.size() >= 5){
- return true;
- }
-
- // 是否购买指定商品
- R<List<VipGood>> vipGoodsByVipId = vipGoodClient.getVipGoodsByVipId(4);
- if (R.isError(vipGoodsByVipId)){
- throw new RuntimeException("根据会员id获取会员购买商品失败：" + vipGoodsByVipId.getMsg());
- }
- List<VipGood> vipGoodList = vipGoodsByVipId.getData();
- if (CollectionUtil.isNotEmpty(vipGoodList)){
- List<String> goodJsonList = vipGoodList.stream().map(VipGood::getGoodJson).collect(Collectors.toList());
- for (String goodJson : goodJsonList) {
- Goods goods = JSONObject.parseObject(goodJson, Goods.class);
- R<List<Order>> orderR = remoteOrderGoodsClient.getOrderListByUserIdAndGoodsId(userId, goods.getId());
- if (R.isError(orderR)){
- throw new RuntimeException("根据用户id和商品id获取订单失败：" + orderR.getMsg());
- }
- if (CollectionUtil.isEmpty(orderR.getData())){
- return false;
- }
- }
- return true;
- }
-
+ .eq(AppUser::getVipId, 3));
return false;
}
--
Gitblit v1.7.1