From b765682e46bcb5e36618075ebf810db22b32dbc5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 26 九月 2024 08:56:11 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 b3e8971..99d7270 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
@@ -136,6 +136,7 @@
return R.ok(vipService.getOne(Wrappers.lambdaQuery(TVip.class)
.eq(TVip::getReveal,1)
.orderByDesc(TVip::getMaximumDeduction)
+ .orderByDesc(TVip::getCreateTime)
.last("LIMIT 1")));
case 2:
return R.ok(vipService.getOne(Wrappers.lambdaQuery(TVip.class)
@@ -146,6 +147,7 @@
return R.ok(vipService.getOne(Wrappers.lambdaQuery(TVip.class)
.eq(TVip::getReveal,1)
.orderByDesc(TVip::getMonthlyCardDiscount)
+ .orderByDesc(TVip::getCreateTime)
.last("LIMIT 1")));
}
}
@@ -180,6 +182,7 @@
vipInfoDto.setDoubleIntegration(vip.getDoubleIntegration());
vipInfoDto.setMallExclusivePrice(vip.getMallExclusivePrice());
vipInfoDto.setName(vip.getName());
+ vipInfoDto.setId(vip.getId());
List<SendCouponDto> javaList = JSON.parseArray(vip.getCoupon()).toJavaList(SendCouponDto.class);
List<VipCouponDto> vipCouponDtos = new ArrayList<>();
if (!javaList.isEmpty()){
@@ -215,8 +218,8 @@
@ApiOperation(value = "购买会员", tags = {"小程序-个人中心"})
@GetMapping("/vipInfo/pay")
- public R vipInfoPay(@RequestParam("vipId")Integer vipId,@RequestParam(name = "1月2季3年",value = "buyType") Integer buyType,
- @RequestParam(name = "1微信2支付宝",value = "payType") Integer payType
+ public R vipInfoPay(@RequestParam("vipId")Integer vipId,@RequestParam("buyType") Integer buyType,
+ @RequestParam("payType") Integer payType
) {
TVip byId = vipService.getById(vipId);
--
Gitblit v1.7.1