From fcabbb78c0158b4417f89475935f0f36f58f0d87 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 10:04:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java | 23 +----------------------
1 files changed, 1 insertions(+), 22 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 6f20e70..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,7 +1,6 @@
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;
@@ -13,8 +12,6 @@
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;
@@ -46,10 +43,6 @@
private VipSettingService vipSettingService;
@Resource
private TokenService tokenService;
- @Resource
- private VipGoodClient vipGoodClient;
- @Resource
- private AppUserService appUserService;
@Resource
private VipCenterService vipCenterService;
@@ -130,22 +123,8 @@
@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("参数错误");
- }
+ return R.ok(vipCenterService.check(type));
}
-
-
private boolean checkSuccess(R<?> r) {
--
Gitblit v1.7.1