From fc21ab0f288823a22a05b13d33f07362b5c6b91c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 13:13:11 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 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 b7762db..8811191 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
@@ -9,6 +9,7 @@
 import com.ruoyi.other.api.domain.VipGood;
 import com.ruoyi.other.api.domain.VipSetting;
 import com.ruoyi.other.api.feignClient.GoodsClient;
+import com.ruoyi.other.dto.SetDto;
 import com.ruoyi.other.dto.VipSetDto;
 import com.ruoyi.other.service.BaseSettingService;
 import com.ruoyi.other.service.VipGoodService;
@@ -111,6 +112,29 @@
         return R.ok(vipSettingService.getById(id));
     }
 
+
+    @PostMapping("getVipSettingById1")
+    public R<VipSetting> getVipSettingById1(@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());
+    }
+
     @GetMapping("/manage/info")
     @ApiOperation(value = "查询", tags = {"后台-会员设置"})
     public R<VipSetDto> managesetinfo() {
@@ -134,6 +158,8 @@
         vipSetDto.setPartPoint(new BigDecimal(base1.getContent()));
         BaseSetting base2 = baseSettingService.getById(2);
         vipSetDto.setBottomPartPoint(new BigDecimal(base2.getContent()));
+        BaseSetting base3 = baseSettingService.getById(3);
+        vipSetDto.setVipInfo(base3.getContent());
         return R.ok(vipSetDto);
     }
 
@@ -179,8 +205,10 @@
     }
     @PostMapping("/manage/level/set")
     @ApiOperation(value = "设置", tags = {"后台-会员等级设置"})
-    public R<Void> managelevelset(@RequestBody List<VipSetting> vipSettingList) {
-        vipSettingService.updateBatchById(vipSettingList);
+    public R<Void> managelevelset(@RequestBody SetDto setDto) {
+        vipSettingService.updateBatchById(setDto.getVipSettingList());
+        //会员降级检测
+        appUserClient.demotionDetection();
         return R.ok();
     }
 

--
Gitblit v1.7.1