From c8ea2d96f5b0522a09f3203ae98fe796084d2d15 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 09:34:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java | 14 ++++++++++++--
1 files changed, 12 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 0fd2778..73b3308 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;
@@ -112,6 +113,13 @@
}
+ @PostMapping("getVipSettingById1")
+ public R<VipSetting> getVipSettingById1(@RequestParam("id") Integer id) {
+ return R.ok(vipSettingService.getById(id));
+ }
+
+
+
/**
* 查询会员配置
* @param id
@@ -150,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);
}
@@ -195,8 +205,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