From c436afe89419da51a5ce593ecd69d3a2f65c5faa Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 九月 2024 10:35:24 +0800
Subject: [PATCH] 对接邮箱 受理开票后发送
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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..797da3c 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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.account.api.dto.SendCouponDto;
import com.ruoyi.common.core.domain.R;
@@ -136,6 +137,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 +148,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 +183,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 +219,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);
@@ -258,6 +262,5 @@
return R.ok(vipService.vipInfoPay(byId,payMoney,payType,discountMoney,discount,buyType,userId));
}
-
}
--
Gitblit v1.7.1