From f46774ffa7f49d910df19530fad4465136b2e0a6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 10 三月 2025 14:34:07 +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 | 15 ++++++++++++---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java | 12 ++++++++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomConfigService.java | 1 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RefundOfDepositVO.java | 8 ++++++++
4 files changed, 33 insertions(+), 3 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 676f100..016f764 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,6 +8,7 @@
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.*;
@@ -182,15 +183,23 @@
}
/**
+ * 获取保证金退还文案
+ */
+ @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();
}
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RefundOfDepositVO.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RefundOfDepositVO.java
new file mode 100644
index 0000000..02ab935
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RefundOfDepositVO.java
@@ -0,0 +1,8 @@
+package com.ruoyi.system.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class RefundOfDepositVO {
+ private String refundOfDeposit;
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomConfigService.java
index 3a80353..ff87bf1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomConfigService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomConfigService.java
@@ -97,4 +97,5 @@
void saveRefundOfDeposit(String refundOfDeposit);
+ String getRefundOfDeposit();
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java
index 2228051..1e6348f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java
@@ -18,6 +18,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -351,4 +352,15 @@
wishDescription.setConfigValue(refundOfDeposit);
saveOrUpdate(wishDescription);
}
+
+ @Override
+ public String getRefundOfDeposit() {
+ AtomicReference<String> refundOfDeposit = new AtomicReference<>("");
+ getCustomConfigByKey(
+ ConfigEnum.WISH_DESCRIPTION.getKey()).ifPresent(
+ customConfig ->
+ refundOfDeposit.set(customConfig.getConfigValue())
+ );
+ return refundOfDeposit.get();
+ }
}
--
Gitblit v1.7.1