From 8f2f35da0cbb07d8bf0d04468c8a2bdf5ee895e5 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期二, 11 三月 2025 10:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java
index a694d2f..e6d01e8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java
@@ -8,10 +8,13 @@
import com.ruoyi.system.api.domain.dto.MgtAfterSaleSettingDTO;
import com.ruoyi.system.domain.dto.PointsConfigDTO;
import com.ruoyi.system.domain.vo.CustomConfigVO;
+import com.ruoyi.system.domain.vo.RefundOfDepositVO;
import com.ruoyi.system.domain.vo.WishSettingVO;
import com.ruoyi.system.service.ICustomConfigService;
-import io.swagger.annotations.*;
-
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
import javax.validation.Valid;
import org.springframework.validation.annotation.Validated;
@@ -39,6 +42,9 @@
@Resource
private ICustomConfigService iCustomConfigService;
@GetMapping(value = "/{configId}")
+ @ApiOperation("获取配置")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "configId", value = "配置键", required = true)})
public R<CustomConfig> getconfig(@PathVariable String configId)
{
LambdaQueryWrapper<CustomConfig> wrapper = Wrappers.lambdaQuery();
@@ -179,15 +185,21 @@
}
/**
+ * 获取保证金退还文案
+ */
+ @ApiOperation("获取保证金退还文案")
+ @GetMapping("/refund-of-deposit")
+ public R<String> getRefundOfDeposit() {
+ return R.ok(iCustomConfigService.getRefundOfDeposit());
+ }
+
+ /**
* 保存保证金退还设置
*/
@ApiOperation(value = "保存保证金退还设置")
@PostMapping("/save-refund-of-deposit")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "refundOfDeposit", value = "保证金退还文案", required = true)})
- public R<?> saveRefundOfDeposit(
- @RequestParam(value = "refundOfDeposit") String refundOfDeposit) {
- iCustomConfigService.saveRefundOfDeposit(refundOfDeposit);
+ public R<?> saveRefundOfDeposit(@RequestBody RefundOfDepositVO refundOfDepositVO) {
+ iCustomConfigService.saveRefundOfDeposit(refundOfDepositVO.getRefundOfDeposit());
return R.ok();
}
}
--
Gitblit v1.7.1