From 5728732f45cc45f3c5cbde0abe7a7c5efee605b9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 09 十二月 2024 15:31:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java |   41 +++++++++++++++++++++--------------------
 1 files changed, 21 insertions(+), 20 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 7ab046c..74e5b9a 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
@@ -1,37 +1,38 @@
 package com.ruoyi.account.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.account.api.model.AppUser;
 import com.ruoyi.account.service.AppUserService;
 import com.ruoyi.account.service.VipCenterService;
+import com.ruoyi.account.service.VipSettingService;
 import com.ruoyi.common.core.domain.R;
-import lombok.RequiredArgsConstructor;
+import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
+import com.ruoyi.order.model.Order;
+import com.ruoyi.other.api.domain.Goods;
+import com.ruoyi.other.api.domain.VipGood;
+import com.ruoyi.other.api.domain.VipSetting;
+import com.ruoyi.other.api.feignClient.VipGoodClient;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
-@RequiredArgsConstructor
 public class VipCenterServiceImpl implements VipCenterService {
-    private final AppUserService appUserService;
+    @Resource
+    private AppUserService appUserService;
+    @Resource
+    private RemoteOrderGoodsClient remoteOrderGoodsClient;
+    @Resource
+    private VipGoodClient vipGoodClient;
+    @Resource
+    private VipSettingService vipSettingService;
+
     @Override
-    public Boolean checkReadyToBeProxy(Long userId) {
-        AppUser appUser = appUserService.getById(userId);
-        if (appUser.getShopPoint() >= 500){
-            return true;
-        }
-        if (appUser.getSharePoint() >= 400){
-            return true;
-        }
-
-        // 当前用户的直推用户
-        List<AppUser> bottomUsers = appUserService.list(new LambdaQueryWrapper<AppUser>()
-                .eq(AppUser::getInviteUserId, userId)
-                .eq(AppUser::getVipId,3));
-        if (bottomUsers.size() >= 5){
-            return true;
-        }
-
+    public Boolean checkReadyToBeProxy(Long userId,Integer vipId) {
         return false;
     }
 

--
Gitblit v1.7.1