From 83761554ac841d584e7cbce014ac5cb39e1d547f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 六月 2024 10:24:08 +0800
Subject: [PATCH] 1.切换OBS为天翼云 2.修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomConfigController.java | 22 ++++++++++++++++++----
1 files changed, 18 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 65c9f63..68a8797 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,13 +5,12 @@
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.api.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;
@@ -52,7 +51,7 @@
*/
@ApiOperation("获取积分设置")
@GetMapping("/points")
- public R<List<CustomConfigVO>> getPointsConfig() {
+ public R<PointsConfigDTO> getPointsConfig() {
return R.ok(iCustomConfigService.getPointsConfig());
}
/**
@@ -91,11 +90,26 @@
return R.ok();
}
-
+ /**
+ * 售后设置
+ *
+ * @param dto 售后设置对象
+ */
@ApiOperation(value = "售后设置")
@PostMapping("/save-after-sale-setting")
public R<?> saveAfterSaleSetting(@Validated @RequestBody MgtAfterSaleSettingDTO dto) {
iCustomConfigService.saveAfterSaleSetting(dto);
return R.ok();
}
+
+ /**
+ * 获取售后设置
+ *
+ * @return List<CustomConfigVO>
+ */
+ @ApiOperation("获取售后设置")
+ @GetMapping("/get-after-sale-setting")
+ public R<MgtAfterSaleSettingDTO> getAfterSaleSetting() {
+ return R.ok(iCustomConfigService.getAfterSaleSetting());
+ }
}
--
Gitblit v1.7.1