From fb6eee80334ae23a2eca8c37baeef05e86c919ed Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 17:09:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 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 d7d820a..7c21768 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,22 +1,22 @@
package com.ruoyi.account.controller;
import com.alibaba.fastjson2.JSONObject;
+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 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;
@@ -41,7 +41,7 @@
@Resource
private TokenService tokenService;
@Resource
- private VipGoodClient vipGoodClient;
+ private VipCenterService vipCenterService;
@GetMapping("getVipLevelList")
@@ -49,7 +49,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 +58,7 @@
}
R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(3);
- if (!checkSuccess(baseSettingR)) {
+ if (checkSuccess(baseSettingR)) {
log.error("【会员设置说明】获取失败:{}", baseSettingR.getMsg());
return R.fail("会员等级获取失败");
}
@@ -81,18 +81,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 +116,17 @@
}
}
+
+ @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());
@@ -145,8 +146,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