From f4c3ae03e80895f33d07c5d2f0a58ac81ef97283 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 07 三月 2025 18:42: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 | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 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 ba8ec76..a694d2f 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,12 @@
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.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;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -31,6 +31,7 @@
* @author mitao
* @since 2024-05-21
*/
+@Validated
@RestController
@RequestMapping("/custom-config")
@Api(value = "系统配置接口", tags = "系统配置接口")
@@ -153,4 +154,40 @@
iCustomConfigService.deleteServicePhone(phone);
return R.ok();
}
+
+ /**
+ * 获取心愿求购说明
+ *
+ * @return
+ */
+ @ApiOperation("获取心愿求购说明、分享配置")
+ @GetMapping("/wish-setting")
+ public R<WishSettingVO> getWishSetting() {
+ return R.ok(iCustomConfigService.getWishSetting());
+ }
+
+ /**
+ * 保存心愿求购设置
+ *
+ * @param vo 保存心愿求购设置
+ */
+ @ApiOperation(value = "保存心愿设置")
+ @PostMapping("/save-wish-setting")
+ public R<?> saveWishDescription(@Valid @RequestBody WishSettingVO vo) {
+ iCustomConfigService.saveWishDescription(vo);
+ return R.ok();
+ }
+
+ /**
+ * 保存保证金退还设置
+ */
+ @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);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1