From 9de28a43ef88214257de629d86c501bb5c0a70b6 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 27 八月 2024 17:35:23 +0800 Subject: [PATCH] 修改 --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 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 b02586b..01368b8 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 @@ -26,6 +26,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -53,8 +54,8 @@ } @GetMapping("/delete") @ApiOperation(tags = {"管理后台-会员管理"},value = "会员删除") - public AjaxResult delete(Integer id) { - vipService.removeById(id); + public AjaxResult delete(String ids) { + vipService.removeBatchByIds(Arrays.asList(ids.split(","))); return AjaxResult.success(); } @PostMapping("/updateVip") @@ -129,7 +130,7 @@ .last("LIMIT 1"))); case 2: return R.ok(vipService.getOne(Wrappers.lambdaQuery(TVip.class) - .eq(TVip::getReveal,1) + .eq(TVip::getReveal,1).eq(TVip::getType,1) .orderByAsc(TVip::getMonthlyCard) .last("LIMIT 1"))); default: @@ -142,8 +143,8 @@ @ApiOperation(value = "会员信息", tags = {"小程序-个人中心"}) - @PostMapping("/vipInfo") - public AjaxResult vipInfo() { + @GetMapping("/vipInfo") + public R<List<VipInfoDto>> vipInfo() { List<VipInfoDto> vipInfoDtos = new ArrayList<>(); List<TVip> vips = vipService.lambdaQuery().eq(TVip::getReveal, 1).list(); for (TVip vip : vips) { @@ -155,6 +156,7 @@ vipInfoDto.setDiscountTimes(vip.getDiscountTimes()); vipInfoDto.setDoubleIntegration(vip.getDoubleIntegration()); vipInfoDto.setMallExclusivePrice(vip.getMallExclusivePrice()); + vipInfoDto.setName(vip.getName()); List<SendCouponDto> javaList = JSON.parseArray(vip.getCoupon()).toJavaList(SendCouponDto.class); List<VipCouponDto> vipCouponDtos = new ArrayList<>(); if (!javaList.isEmpty()){ @@ -179,7 +181,7 @@ vipInfoDto.setTotalDiscount(total); vipInfoDtos.add(vipInfoDto); } - return AjaxResult.success(vipInfoDtos); + return R.ok(vipInfoDtos); } } -- Gitblit v1.7.1