From 7473e0157c4f687c354ec351c3a22a40d1788ed5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 28 八月 2024 10:41:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 e0a0fae..b60c3de 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
@@ -25,6 +25,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -143,19 +144,34 @@
@ApiOperation(value = "会员信息", tags = {"小程序-个人中心"})
- @PostMapping("/vipInfo")
- public AjaxResult<VipInfoDto> vipInfo() {
+ @GetMapping("/vipInfo")
+ public R<List<VipInfoDto>> vipInfo() {
List<VipInfoDto> vipInfoDtos = new ArrayList<>();
List<TVip> vips = vipService.lambdaQuery().eq(TVip::getReveal, 1).list();
+ LocalDateTime now = LocalDateTime.now();
for (TVip vip : vips) {
VipInfoDto vipInfoDto = new VipInfoDto();
vipInfoDto.setMonthlyCard(vip.getMonthlyCardReveal()==1?vip.getMonthlyCard():null);
vipInfoDto.setSeasonCard(vip.getSeasonCardReveal()==1?vip.getSeasonCard():null);
vipInfoDto.setAnnualCard(vip.getAnnualCardReveal()==1?vip.getAnnualCard():null);
+ //判断是否在折扣时间内，然后设置折扣价格
+ if (vip.getMonthlyCardDiscountStart()!=null&&(now.isAfter(vip.getMonthlyCardDiscountStart())&&now.isBefore(vip.getMonthlyCardDiscountEnd()))){
+ vipInfoDto.setMonthlyCardDiscount(vip.getMonthlyCardDiscount());
+ }
+ if (vip.getSeasonCardDiscountStart()!=null&&(now.isAfter(vip.getSeasonCardDiscountStart())&&now.isBefore(vip.getSeasonCardDiscountEnd()))){
+ vipInfoDto.setSeasonCardDiscount(vip.getSeasonCardDiscount());
+ }
+ if (vip.getAnnualCardDiscountStart()!=null&&(now.isAfter(vip.getAnnualCardDiscountStart())&&now.isBefore(vip.getAnnualCardDiscountEnd()))){
+ vipInfoDto.setAnnualCardDiscount(vip.getAnnualCardDiscount());
+ }
+
+
+
vipInfoDto.setMaximumDeduction(vip.getMaximumDeduction());
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()){
@@ -175,12 +191,13 @@
total = total.add(vip.getMaximumDeduction().multiply(BigDecimal.valueOf(vip.getDiscountTimes())));
for (VipCouponDto vipCouponDto : vipCouponDtos) {
TCoupon tCoupon = vipCouponDto.getTCoupon();
- total.add(tCoupon.getDiscount());
+ total.add(tCoupon.getMaximumDiscountAmount());
}
vipInfoDto.setTotalDiscount(total);
+ vipInfoDto.setTimeAmount(vip.getMaximumDeduction().multiply(BigDecimal.valueOf(vip.getDiscountTimes())));
vipInfoDtos.add(vipInfoDto);
}
- return AjaxResult.success(vipInfoDtos);
+ return R.ok(vipInfoDtos);
}
}
--
Gitblit v1.7.1