From 3d6c34f45d76b78151d6586f93acca2943698b08 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 09 十二月 2024 10:56:42 +0800
Subject: [PATCH] 1.
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 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 8aefe19..2c1f6f5 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
@@ -8,6 +8,7 @@
import com.ruoyi.account.vo.vip.Level;
import com.ruoyi.account.vo.vip.VipLevel;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.api.feignClient.BaseSettingClient;
@@ -87,18 +88,8 @@
vipSettingList.forEach(vipSetting -> {
Level level = new Level();
- level.setId(vipSetting.getId());
- level.setName(vipSetting.getVipName());
- level.setVipInfo(vipSetting.getVipInfo());
+ BeanUtils.copyBeanProp(level, vipSetting);
level.setVipDesc(baseSetting.getContent());
- level.setVipLevelUpShop(vipSetting.getVipLevelUpShop());
- level.setVipLevelUpShare(vipSetting.getVipLevelUpShare());
- level.setKeepBuyDay(vipSetting.getKeepBuyDay());
- level.setKeepBuyPoint(vipSetting.getKeepBuyPoint());
- level.setKeepShareDay(vipSetting.getKeepShareDay());
- level.setKeepSharePoint(vipSetting.getKeepSharePoint());
- level.setKeepShopDay(vipSetting.getKeepShopDay());
- level.setKeepShopPoint(vipSetting.getKeepShopPoint());
R<GoodsVip> goodsVipR = goodsVipMap.get(vipSetting.getId());
if (R.isSuccess(goodsVipR)) {
@@ -136,18 +127,14 @@
public R<Void> test() {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
AppUser appUser = appUserService.getById(loginUserApplet.getUserid());
- if (appUser.getShopPoint() < 500){
- return R.fail("消费积分不足500");
+ if (appUser.getShopPoint() >= 500){
+ return R.ok();
}
- if (appUser.getSharePoint() < 500){
- return R.fail("返佣积分不足500");
+ if (appUser.getSharePoint() >= 400){
+ return R.ok();
}
- // 当前用户的直推用户
-// List<AppUser> bottomUsers = appUserService.list(new LambdaQueryWrapper<AppUser>()
-// .eq(AppUser::getInviteUserId, loginUserApplet.getUserid())
-// .eq(AppUser::getVipId));
-
+ return R.fail();
}
--
Gitblit v1.7.1