From 88ac2574d89aed7c28b9c0370b19b8bb2d0364eb Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 07 一月 2025 19:02:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
index 8ebbd2f..02c2d68 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
@@ -17,6 +17,8 @@
import com.ruoyi.common.core.web.page.PageInfo;
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.TCoupon;
import com.ruoyi.other.api.domain.TIntegralRule;
@@ -59,6 +61,9 @@
private TCouponService couponService;
@Resource
private TokenService tokenService;
+
+
+ @RequiresPermissions(value = {"/vipSetting/addOrdinaryMember", "/vipSetting/addInternalMember"}, logical = Logical.OR)
@PostMapping("/saveVip")
@ApiOperation(tags = {"管理后台-会员管理"},value = "会员添加")
@Log(title = "【会员管理】添加会员", businessType = BusinessType.INSERT)
@@ -66,6 +71,9 @@
vipService.save(dto);
return AjaxResult.success();
}
+
+
+ @RequiresPermissions(value = {"/vipSetting/del"}, logical = Logical.OR)
@GetMapping("/delete")
@ApiOperation(tags = {"管理后台-会员管理"},value = "会员删除")
@Log(title = "【会员管理】删除会员", businessType = BusinessType.DELETE)
@@ -73,6 +81,9 @@
vipService.removeBatchByIds(Arrays.asList(ids.split(",")));
return AjaxResult.success();
}
+
+
+ @RequiresPermissions(value = {"/vipSetting/update"}, logical = Logical.OR)
@PostMapping("/updateVip")
@ApiOperation(tags = {"管理后台-会员管理"},value = "会员修改")
@Log(title = "【会员管理】修改会员", businessType = BusinessType.UPDATE)
@@ -80,6 +91,9 @@
vipService.updateById(dto);
return AjaxResult.success();
}
+
+
+ @RequiresPermissions(value = {"/vipSetting/select"}, logical = Logical.OR)
@GetMapping("/getInfo")
@ApiOperation(tags = {"管理后台-会员管理"},value = "会员查看详情")
public AjaxResult<TVip> getInfo(Integer id) {
@@ -107,16 +121,19 @@
public R<TVip> getInfo1(@RequestParam("id")Integer id) {
return R.ok(vipService.getById(id));
}
-
-
-
-
+
+
+
+ @RequiresPermissions(value = {"/vipSetting/list", "/vipOrder"}, logical = Logical.OR)
@ApiOperation(tags = {"管理后台-会员管理"},value = "会员列表分页查询")
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TVip>> pageList(@RequestBody BasePage basePage) {
return AjaxResult.ok(vipService.pageList(basePage.getPageCurr(), basePage.getPageSize()));
}
-
+
+
+
+ @RequiresPermissions(value = {"/appUser/list", "/appUser/giftVip", "/appUser/gift_vip", "/vipList"}, logical = Logical.OR)
@ApiOperation(tags = {"会员下拉框"},value = "会员列表分页查询")
@GetMapping(value = "/select")
public AjaxResult<List<TVip>> select() {
@@ -322,7 +339,7 @@
@ApiOperation(value = "购买会员", tags = {"小程序-个人中心"})
@GetMapping("/vipInfo/pay")
- public R vipInfoPay(@RequestParam("vipId")Integer vipId,@RequestParam("buyType") Integer buyType,
+ public Object vipInfoPay(@RequestParam("vipId")Integer vipId,@RequestParam("buyType") Integer buyType,
@RequestParam("payType") Integer payType
) {
@@ -366,7 +383,7 @@
Long userId = tokenService.getLoginUserApplet().getUserId();
- return R.ok(vipService.vipInfoPay(byId,payMoney,payType,discountMoney,discount,buyType,userId));
+ return vipService.vipInfoPay(byId,payMoney,payType,discountMoney,discount,buyType,userId);
}
}
--
Gitblit v1.7.1