From a988a89e6b0cd75a5df4691eb8196c0ef9513a05 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 19:46:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 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..da3798d 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() {
@@ -179,8 +203,8 @@
}
@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());
return R.ok();
}
--
Gitblit v1.7.1