From 5230efec78bf6f7a9a9c8c097161c47a2391aace Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 10 三月 2025 14:49:20 +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 | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 71872ff..10edd13 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,12 +8,11 @@
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.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
+
import javax.annotation.Resource;
import javax.validation.Valid;
import org.springframework.validation.annotation.Validated;
@@ -41,6 +40,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,4 +181,23 @@
iCustomConfigService.saveWishDescription(vo);
return R.ok();
}
+
+ /**
+ * 获取保证金退还文案
+ */
+ @ApiOperation("获取保证金退还文案")
+ @GetMapping("/refund-of-deposit")
+ public R<String> getRefundOfDeposit() {
+ return R.ok(iCustomConfigService.getRefundOfDeposit());
+ }
+
+ /**
+ * 保存保证金退还设置
+ */
+ @ApiOperation(value = "保存保证金退还设置")
+ @PostMapping("/save-refund-of-deposit")
+ public R<?> saveRefundOfDeposit(@RequestBody RefundOfDepositVO refundOfDepositVO) {
+ iCustomConfigService.saveRefundOfDeposit(refundOfDepositVO.getRefundOfDeposit());
+ return R.ok();
+ }
}
--
Gitblit v1.7.1