From 61a5a48b7f955c341dc4eb7738d5cc34c55eb844 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 09 十二月 2024 14:05:31 +0800
Subject: [PATCH] 1.
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java | 52 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 37 insertions(+), 15 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..6f20e70 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,21 +1,27 @@
package com.ruoyi.account.controller;
import com.alibaba.fastjson2.JSONObject;
+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;
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;
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;
@@ -40,8 +46,12 @@
private VipSettingService vipSettingService;
@Resource
private TokenService tokenService;
-// @Resource
-// private VipGoodClient vipGoodClient;
+ @Resource
+ private VipGoodClient vipGoodClient;
+ @Resource
+ private AppUserService appUserService;
+ @Resource
+ private VipCenterService vipCenterService;
@GetMapping("getVipLevelList")
@@ -49,7 +59,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();
@@ -58,7 +68,7 @@
}
R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(3);
- if (!checkSuccess(baseSettingR)) {
+ if (checkSuccess(baseSettingR)) {
log.error("【会员设置说明】获取失败:{}", baseSettingR.getMsg());
return R.fail("会员等级获取失败");
}
@@ -81,18 +91,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)) {
@@ -126,6 +126,28 @@
}
}
+
+ @GetMapping("/check")
+ @ApiOperation(value = "会员申请检查", tags = {"会员中心-小程序"})
+ public R<Boolean> check(@ApiParam("4:准代理，5：代理，6：总代理，7：合伙人") @RequestParam Integer type) {
+ LoginUser loginUser = tokenService.getLoginUser();
+ Long userid = loginUser.getUserid();
+ if (type == 4){
+ return R.ok(vipCenterService.checkReadyToBeProxy(userid, type));
+ }else if (type == 5){
+ return R.ok(vipCenterService.checkReadyToBeAgent(userid));
+ }else if (type == 6){
+ return R.ok(vipCenterService.checkReadyToBeTotalAgent(userid));
+ }else if (type == 7){
+ return R.ok(vipCenterService.checkReadyToBePartner(userid));
+ }else {
+ return R.fail("参数错误");
+ }
+ }
+
+
+
+
private boolean checkSuccess(R<?> r) {
if (!R.isSuccess(r)) {
log.error("请求失败: " + r.getMsg());
--
Gitblit v1.7.1