From 8ca8432f7dfb2c58ff6c0f9d1f7224b262bdaba4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 16:32:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java
index 71f60cf..8aefe19 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java
@@ -1,6 +1,9 @@
package com.ruoyi.account.controller;
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.VipSettingService;
import com.ruoyi.account.vo.vip.Level;
import com.ruoyi.account.vo.vip.VipLevel;
@@ -11,6 +14,7 @@
import com.ruoyi.other.api.feignClient.GoodsVipClient;
import com.ruoyi.other.api.feignClient.RemoteVipSettingClient;
import com.ruoyi.other.api.feignClient.VipGoodClient;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.log4j.Log4j2;
@@ -40,8 +44,10 @@
private VipSettingService vipSettingService;
@Resource
private TokenService tokenService;
-// @Resource
-// private VipGoodClient vipGoodClient;
+ @Resource
+ private VipGoodClient vipGoodClient;
+ @Resource
+ private AppUserService appUserService;
@GetMapping("getVipLevelList")
@@ -126,6 +132,27 @@
}
}
+
+ public R<Void> test() {
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ AppUser appUser = appUserService.getById(loginUserApplet.getUserid());
+ if (appUser.getShopPoint() < 500){
+ return R.fail("消费积分不足500");
+ }
+ if (appUser.getSharePoint() < 500){
+ return R.fail("返佣积分不足500");
+ }
+ // 当前用户的直推用户
+// List<AppUser> bottomUsers = appUserService.list(new LambdaQueryWrapper<AppUser>()
+// .eq(AppUser::getInviteUserId, loginUserApplet.getUserid())
+// .eq(AppUser::getVipId));
+
+
+ }
+
+
+
+
private boolean checkSuccess(R<?> r) {
if (!R.isSuccess(r)) {
log.error("请求失败: " + r.getMsg());
--
Gitblit v1.7.1