From a0eae3ecda7b70468c60a0079db6c4609c29939d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 17 四月 2025 09:36:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou

---
 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AgreementController.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AgreementController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AgreementController.java
index 0a747a1..5df2e91 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AgreementController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AgreementController.java
@@ -14,6 +14,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Objects;
 
 /**
  * <p>
@@ -40,7 +41,7 @@
     @ApiOperation(value = "根据类型获取注册协议、隐私政策、司机操作指南", tags = {"后台-隐私政策/司机操作指南"})
     @GetMapping(value = "/dataInfo")
     @ApiImplicitParams({
-            @ApiImplicitParam(value = "查询类型(0注册协议;1:隐私政策;2:司机操作指导)", name = "type", dataType = "Integer", required = true)
+            @ApiImplicitParam(value = "查询类型(0注册协议;1:隐私政策;2:司机操作指导;3:服务规则管理)", name = "type", dataType = "Integer", required = true)
     })
     public R<Agreement> dataInfo(@RequestParam("type") Integer type) {
         return agreementService.dataInfo(type);
@@ -77,4 +78,20 @@
         return agreementService.saveData(agreement);
     }
 
+    /**
+     * 修改服务规则管理
+     *
+     * @param agreement 修改服务规则管理
+     */
+    @RequiresPermissions(value = {"advantage_update", "operate_save"}, logical = Logical.OR)
+    @ApiOperation(value = "修改服务规则管理", tags = {"后台-修改服务规则管理[2.0]"})
+    @PostMapping(value = "/updateAgree")
+    public R<String> updateAgree(@RequestBody Agreement agreement) {
+        if(Objects.isNull(agreement.getContentType()) || agreement.getContentType()!=3){
+            return R.fail("服务规则管理类型异常");
+        }
+        agreementService.updateById(agreement);
+        return R.ok();
+    }
+
 }

--
Gitblit v1.7.1