From 4d7a208f388e42e7dd83dab0e38eadfa0847de1c Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 11 十二月 2024 19:24:10 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java index 39e822d..08fd0dc 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java @@ -12,6 +12,8 @@ import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.Logical; +import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.other.api.domain.THtml; import com.ruoyi.other.api.domain.TIntegralRule; @@ -67,6 +69,9 @@ private TokenService tokenService; @Autowired private TVipService vipService; + + + @RequiresPermissions(value = {"/IntegralSetting"}, logical = Logical.OR) @GetMapping("/getSet") @ApiOperation(tags = {"管理后台-积分管理","小程序-个人中心-签到"},value = "获取积分设置") public R<TIntegralRule> getSet() { @@ -92,6 +97,8 @@ return R.ok(res); } + + @RequiresPermissions(value = {"/IntegralSetting"}, logical = Logical.OR) @PostMapping("/saveSet") @ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分设置") @Log(title = "【积分管理】保存积分设置", businessType = BusinessType.INSERT) @@ -105,8 +112,10 @@ } return R.ok(); } - - + + + + @RequiresPermissions(value = {"/vipSetting/html"}, logical = Logical.OR) @GetMapping("/getInfo") @ApiOperation(tags = {"管理后台-积分管理"},value = "type 1=积分规则说明," + "2=会员折扣说明," + @@ -126,9 +135,10 @@ } return R.ok(g.getContent()); } - - - + + + + @RequiresPermissions(value = {"/vipSetting/html"}, logical = Logical.OR) @PostMapping("/saveInfo") @ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分说明") @Log(title = "【积分管理】保存积分说明", businessType = BusinessType.INSERT) -- Gitblit v1.7.1