From ff2ef0cfdaf6c2217c728d4c7cd91ea47e1f3ac9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 十二月 2024 16:11:04 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java | 43 +++++++++++++------------------------------
1 files changed, 13 insertions(+), 30 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..056a580 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;
@@ -15,13 +13,11 @@
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.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -46,9 +42,9 @@
@Resource
private TokenService tokenService;
@Resource
- private VipGoodClient vipGoodClient;
+ private VipCenterService vipCenterService;
@Resource
- private AppUserService appUserService;
+ private VipGoodClient vipGoodClient;
@GetMapping("getVipLevelList")
@@ -56,7 +52,7 @@
public R<VipLevel> vipLevelList() {
try {
R<List<VipSetting>> r = remoteVipSettingClient.list();
- if (!checkSuccess(r)) {
+ if (R.isError(r)) {
return R.fail("会员等级获取失败");
}
List<VipSetting> vipSettingList = r.getData();
@@ -65,7 +61,7 @@
}
R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(3);
- if (!checkSuccess(baseSettingR)) {
+ if (R.isError(baseSettingR)) {
log.error("【会员设置说明】获取失败:{}", baseSettingR.getMsg());
return R.fail("会员等级获取失败");
}
@@ -124,28 +120,15 @@
}
- 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) {
- if (!R.isSuccess(r)) {
- log.error("请求失败: " + r.getMsg());
- }
- return R.isSuccess(r);
- }
private Map<Integer, R<GoodsVip>> getGoodsVips(List<Integer> vipIds) {
Map<Integer, R<GoodsVip>> result = new HashMap<>();
@@ -159,8 +142,8 @@
private Map<Integer, R<List<VipGood>>> getVipGoods(List<Integer> vipIds) {
Map<Integer, R<List<VipGood>>> result = new HashMap<>();
for (Integer vipId : vipIds) {
-// R<List<VipGood>> vipGoodR = vipGoodClient.getVipGoodsByVipId(vipId);
-// result.put(vipId, vipGoodR);
+ R<List<VipGood>> vipGoodR = vipGoodClient.getVipGoodsByVipId(vipId);
+ result.put(vipId, vipGoodR);
}
return result;
}
--
Gitblit v1.7.1