From f47d695f19bca1e58ddedcc10f8d3dff7d7f8f1d Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 21 八月 2024 11:39:43 +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/TVipController.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 dfd4f46..b02586b 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
@@ -6,6 +6,7 @@
import com.ruoyi.account.api.dto.SendCouponDto;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TIntegralRule;
@@ -45,25 +46,25 @@
@Resource
private TCouponService couponService;
@PostMapping("/saveVip")
- @ApiOperation(value = "会员添加")
+ @ApiOperation(tags = {"管理后台-会员管理"},value = "会员添加")
public AjaxResult saveVip(@RequestBody TVip dto) {
vipService.save(dto);
return AjaxResult.success();
}
@GetMapping("/delete")
- @ApiOperation(value = "会员删除")
+ @ApiOperation(tags = {"管理后台-会员管理"},value = "会员删除")
public AjaxResult delete(Integer id) {
vipService.removeById(id);
return AjaxResult.success();
}
@PostMapping("/updateVip")
- @ApiOperation(value = "会员修改")
+ @ApiOperation(tags = {"管理后台-会员管理"},value = "会员修改")
public AjaxResult updateVip(@RequestBody TVip dto) {
vipService.updateById(dto);
return AjaxResult.success();
}
@GetMapping("/getInfo")
- @ApiOperation(value = "会员查看详情")
+ @ApiOperation(tags = {"管理后台-会员管理"},value = "会员查看详情")
public AjaxResult<TVip> getInfo(Integer id) {
return AjaxResult.ok(vipService.getById(id));
}
@@ -84,14 +85,20 @@
public R<TVip> getInfo1(@RequestParam("id")Integer id) {
return R.ok(vipService.getById(id));
}
- @ApiOperation(value = "会员列表分页查询")
+
+
+
+
+ @ApiOperation(tags = {"管理后台-会员管理"},value = "会员列表分页查询")
@PostMapping(value = "/pageList")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "pageCurr", value = "分页参数，当前页码", required = true),
- @ApiImplicitParam(name = "pageSize", value = "分页参数，每页数量",required = true)
- })
- public AjaxResult<PageInfo<TVip>> pageList(Integer pageCurr,Integer pageSize) {
- return AjaxResult.ok(vipService.pageList(pageCurr,pageSize));
+ public AjaxResult<PageInfo<TVip>> pageList(@RequestBody BasePage basePage) {
+ return AjaxResult.ok(vipService.pageList(basePage.getPageCurr(), basePage.getPageSize()));
+ }
+
+ @ApiOperation(tags = {"会员下拉框"},value = "会员列表分页查询")
+ @GetMapping(value = "/select")
+ public AjaxResult<List<TVip>> select() {
+ return AjaxResult.ok(vipService.list());
}
//获取会员Map
--
Gitblit v1.7.1