From d7b3c61e01aadf99ce6a1d8ebf18c4e6dd81cc2b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 12 十二月 2024 18:05:34 +0800
Subject: [PATCH] 12.12
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java | 33 ++++++++++-----------------------
1 files changed, 10 insertions(+), 23 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 2c1f6f5..aeb40c0 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,9 +1,7 @@
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.VipCenterService;
import com.ruoyi.account.service.VipSettingService;
import com.ruoyi.account.vo.vip.Level;
import com.ruoyi.account.vo.vip.VipLevel;
@@ -14,13 +12,13 @@
import com.ruoyi.other.api.feignClient.BaseSettingClient;
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 io.swagger.annotations.ApiParam;
import lombok.extern.log4j.Log4j2;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@@ -46,9 +44,7 @@
@Resource
private TokenService tokenService;
@Resource
- private VipGoodClient vipGoodClient;
- @Resource
- private AppUserService appUserService;
+ private VipCenterService vipCenterService;
@GetMapping("getVipLevelList")
@@ -56,7 +52,7 @@
public R<VipLevel> vipLevelList() {
try {
R<List<VipSetting>> r = remoteVipSettingClient.list();
- if (!checkSuccess(r)) {
+ if (checkSuccess(r)) {
return R.fail("会员等级获取失败");
}
List<VipSetting> vipSettingList = r.getData();
@@ -65,7 +61,7 @@
}
R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(3);
- if (!checkSuccess(baseSettingR)) {
+ if (checkSuccess(baseSettingR)) {
log.error("【会员设置说明】获取失败:{}", baseSettingR.getMsg());
return R.fail("会员等级获取失败");
}
@@ -124,20 +120,11 @@
}
- public R<Void> test() {
- LoginUser loginUserApplet = tokenService.getLoginUserApplet();
- AppUser appUser = appUserService.getById(loginUserApplet.getUserid());
- if (appUser.getShopPoint() >= 500){
- return R.ok();
- }
- if (appUser.getSharePoint() >= 400){
- return R.ok();
- }
-
- return R.fail();
+ @GetMapping("/check")
+ @ApiOperation(value = "会员申请检查", tags = {"会员中心-小程序"})
+ public R<Boolean> check(@ApiParam("4:准代理，5：代理，6：总代理，7：合伙人") @RequestParam Integer type) {
+ return R.ok(vipCenterService.check(type));
}
-
-
private boolean checkSuccess(R<?> r) {
--
Gitblit v1.7.1