From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BaseSettingController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BaseSettingController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BaseSettingController.java
index 7f360cb..c4a9776 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BaseSettingController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/BaseSettingController.java
@@ -1,9 +1,15 @@
package com.ruoyi.other.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.BaseSetting;
import com.ruoyi.other.service.BaseSettingService;
+import com.ruoyi.other.vo.RefundPassSettingVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -18,6 +24,7 @@
*/
@RestController
@RequestMapping("/base-setting")
+@Api("基础配置")
public class BaseSettingController {
@Resource
@@ -30,14 +37,55 @@
* @return
*/
@ResponseBody
- @PostMapping("/getBaseSetting")
+ @GetMapping("/getBaseSetting")
+ @ApiOperation(value = "获取基础配置", tags = {"管理后台-基础配置"})
public R<BaseSetting> getBaseSetting(@RequestParam("id") Integer id){
BaseSetting baseSetting = baseSettingService.getById(id);
return R.ok(baseSetting);
}
+
+ /**
+ * 保存设置
+ */
+ @ApiOperation(value = "保存设置", tags = {"管理后台-基础配置"})
+ @PostMapping("/save")
+ public R saveActivityConfig(@RequestBody String json){
+ JSONObject jsonObject = JSONObject.parseObject(json);
+ Integer id = jsonObject.getInteger("id");
+ BaseSetting baseSetting = baseSettingService.getById(id);
+ baseSetting.setContent(jsonObject.getString("content"));
+ baseSettingService.saveOrUpdate(baseSetting);
+ return R.ok();
+ }
+
+
+ @PostMapping("/setRefundPassSetting")
+ @ApiOperation(value = "保存售后设置", tags = {"管理后台-售后管理"})
+ public R setRefundPassSetting(@RequestBody RefundPassSettingVo settingVo){
+ BaseSetting one = baseSettingService.getOne(new LambdaQueryWrapper<BaseSetting>().eq(BaseSetting::getId, 5));
+ if(null == one){
+ one = new BaseSetting();
+ one.setId(5);
+ one.setContent(JSON.toJSONString(settingVo));
+ baseSettingService.save(one);
+ }else{
+ one.setContent(JSON.toJSONString(settingVo));
+ baseSettingService.updateById(one);
+ }
+ return R.ok();
+ }
-
+ @GetMapping("/getRefundPassSetting")
+ @ApiOperation(value = "获取售后设置", tags = {"管理后台-售后管理"})
+ public R<RefundPassSettingVo> getRefundPassSetting(){
+ BaseSetting one = baseSettingService.getOne(new LambdaQueryWrapper<BaseSetting>().eq(BaseSetting::getId, 5));
+ if(null != one){
+ RefundPassSettingVo refundPassSettingVo = JSON.parseObject(one.getContent(), RefundPassSettingVo.class);
+ return R.ok(refundPassSettingVo);
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.7.1