From 2427b05aeca08ee3c4998843bf749d35440d461b Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 15 六月 2024 21:33:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java |   69 +++++++++++++++++++++++++++++++++-
 1 files changed, 66 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 3299eba..65c9f63 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
@@ -5,14 +5,22 @@
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.domain.CustomConfig;
+import com.ruoyi.system.domain.dto.MgtAfterSaleSettingDTO;
+import com.ruoyi.system.domain.dto.PointsConfigDTO;
+import com.ruoyi.system.domain.vo.CustomConfigVO;
 import com.ruoyi.system.service.ICustomConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
 
 /**
  * <p>
@@ -24,6 +32,7 @@
  */
 @RestController
 @RequestMapping("/custom-config")
+@Api(value = "系统配置接口", tags = "系统配置接口")
 public class CustomConfigController {
     @Resource
     private ICustomConfigService iCustomConfigService;
@@ -35,4 +44,58 @@
         CustomConfig one = iCustomConfigService.getOne(wrapper);
         return R.ok(one);
     }
+
+    /**
+     * 获取积分设置
+     *
+     * @return List<CustomConfig>
+     */
+    @ApiOperation("获取积分设置")
+    @GetMapping("/points")
+    public R<List<CustomConfigVO>> getPointsConfig() {
+        return R.ok(iCustomConfigService.getPointsConfig());
+    }
+    /**
+     * 保存积分设置
+     *
+     * @param dto 积分配置数据传输对象
+     */
+    @ApiOperation(value = "保存积分设置")
+    @PostMapping("/save-points")
+    public R<?> savePointsSettings(@Validated @RequestBody PointsConfigDTO dto) {
+        iCustomConfigService.savePointsSettings(dto);
+        return R.ok();
+    }
+
+    /**
+     * 获取订单说明设置
+     *
+     * @return CustomConfigVO
+     */
+    @ApiOperation("获取订单说明设置")
+    @GetMapping("/order-desc")
+    public R<CustomConfigVO> getOrderDesc() {
+        return R.ok(iCustomConfigService.getOrderDesc());
+    }
+
+    /**
+     * 订单说明设置
+     *
+     * @param description 订单说明
+     */
+    @ApiOperation(value = "订单说明设置")
+    @PostMapping("/save-order-desc")
+    public R<?> saveOrderDescription(
+            @RequestParam(value = "description", required = true) String description) {
+        iCustomConfigService.saveOrderDescription(description);
+        return R.ok();
+    }
+
+
+    @ApiOperation(value = "售后设置")
+    @PostMapping("/save-after-sale-setting")
+    public R<?> saveAfterSaleSetting(@Validated @RequestBody MgtAfterSaleSettingDTO dto) {
+        iCustomConfigService.saveAfterSaleSetting(dto);
+        return R.ok();
+    }
 }

--
Gitblit v1.7.1