From 74b0e0814e37d640596f44ec86d20fa9ecce9ed6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 10:42:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 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..a029e65 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,12 +69,24 @@
private TokenService tokenService;
@Autowired
private TVipService vipService;
+
+
+ @RequiresPermissions(value = {"/IntegralSetting"}, logical = Logical.OR)
@GetMapping("/getSet")
- @ApiOperation(tags = {"管理后台-积分管理","小程序-个人中心-签到"},value = "获取积分设置")
+ @ApiOperation(tags = {"管理后台-积分管理"},value = "获取积分设置")
public R<TIntegralRule> getSet() {
TIntegralRule res = integralRuleService.getOne(new QueryWrapper<>());
return R.ok(res);
}
+
+ @PostMapping("/getSet2")
+ public R<TIntegralRule> getSet2() {
+ TIntegralRule res = integralRuleService.getOne(new QueryWrapper<>());
+ return R.ok(res);
+ }
+
+
+
@GetMapping("/getSet1")
@ApiOperation(tags = {"小程序-个人中心-签到"},value = "获取积分设置")
public R<TIntegralRule> getSet1() {
@@ -92,6 +106,8 @@
return R.ok(res);
}
+
+ @RequiresPermissions(value = {"/IntegralSetting"}, logical = Logical.OR)
@PostMapping("/saveSet")
@ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分设置")
@Log(title = "【积分管理】保存积分设置", businessType = BusinessType.INSERT)
@@ -105,8 +121,10 @@
}
return R.ok();
}
-
-
+
+
+
+ @RequiresPermissions(value = {"/vipSetting/html"}, logical = Logical.OR)
@GetMapping("/getInfo")
@ApiOperation(tags = {"管理后台-积分管理"},value = "type 1=积分规则说明，" +
"2=会员折扣说明，" +
@@ -126,9 +144,31 @@
}
return R.ok(g.getContent());
}
-
-
-
+
+
+ @GetMapping("/getInfo1")
+ @ApiOperation(tags = {"小程序-积分管理"},value = "type 1=积分规则说明，" +
+ "2=会员折扣说明，" +
+ "3=优惠券说明，" +
+ "4=双倍积分说明，" +
+ "5=商城专享价说明，" +
+ "6=会员协议，" +
+ "7=用户协议，" +
+ "8=隐私协议，" +
+ "9=邀请好友说明，" +
+ "10=资质证明，" +
+ "11=开票说明")
+ public R<String> getInfo1(Integer type) {
+ THtml g = htmlService.getOne(new QueryWrapper<THtml>().eq("type",type));
+ if (g == null){
+ return R.ok("");
+ }
+ 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