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-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java
index f6515b0..d1f92f3 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java
@@ -2,26 +2,18 @@
import com.ruoyi.account.api.feignClient.AppUserClient;
-import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.other.api.domain.VipGood;
import com.ruoyi.other.api.domain.VipSetting;
import com.ruoyi.other.service.VipGoodService;
import com.ruoyi.other.service.VipSettingService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.other.api.domain.VipSetting;
-import com.ruoyi.other.service.VipSettingService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import javax.annotation.Resource;
import java.util.List;
-
-import javax.annotation.Resource;
/**
* <p>
@@ -44,7 +36,7 @@
@Resource
private VipGoodService vipGoodService;
- @PostMapping("/info")
+ @GetMapping("/info")
@ApiOperation(value = "获取各级会员信息", tags = {"小程序-个人中心首页", "小程序-会员中心"})
public R<List<VipSetting>> info() {
List<VipSetting> list = vipSettingService.list();
@@ -100,9 +92,25 @@
@GetMapping("getVipSettingById")
@ApiOperation(value = "获取会员设置")
- public R<VipSetting> getVipSettingById(@ApiParam(value = "会员id") @RequestParam Integer id) {
+ public R<VipSetting> getVipSettingById(@ApiParam(value = "会员id") @RequestParam("id") Integer id) {
return R.ok(vipSettingService.getById(id));
}
+
+
+ /**
+ * 查询会员配置
+ * @param id
+ * @return
+ */
+ @PostMapping("/getVipSetting")
+ public R<VipSetting> getVipSetting(@RequestParam("id") Integer id) {
+ return R.ok(vipSettingService.getById(id));
+ }
+
+ @GetMapping("/list")
+ public R<List<VipSetting>> getList(){
+ return R.ok(vipSettingService.list());
+ }
}
--
Gitblit v1.7.1