From 76bd7b4ea56c67feab076399ca1a8d28798d2acf Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 01 十一月 2024 17:22:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 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 d27cac8..8ebbd2f 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,11 +2,15 @@
import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
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.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.feignClient.AppUserVipDetailClient;
import com.ruoyi.account.api.model.TAppUser;
+import com.ruoyi.account.api.model.TAppUserVipDetail;
+import com.ruoyi.account.api.vo.GetAppUserVipDetail;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
@@ -87,6 +91,11 @@
@ApiOperation(value = "通过id查会员")
public R<TVip> getById(Integer id) {
return R.ok(vipService.getById(id));
+ }
+
+ @GetMapping(value = "/getVipList")
+ public R<List<TVip>> getVipList(){
+ return R.ok(vipService.lambdaQuery().eq(TVip::getReveal, 1).list());
}
/**
@@ -222,6 +231,9 @@
@Resource
private AppUserClient appUserClient;
+ @Resource
+ private AppUserVipDetailClient vipDetailClient;
+
@ApiOperation(value = "当前生效会员信息", tags = {"小程序-个人中心"})
@GetMapping("/recent/vipInfo")
public R<List<VipInfoDto>> recentVipInfo() {
@@ -230,7 +242,17 @@
if (data.getVipEndTime()!=null&&data.getVipEndTime().isAfter(LocalDateTime.now())) {
List<VipInfoDto> vipInfoDtos = new ArrayList<>();
- List<TVip> vips = vipService.lambdaQuery().eq(TVip::getId, data.getVipId()).list();
+
+// List<TVip> vips = vipService.lambdaQuery().eq(TVip::getId, data.getVipId()).list();
+ List<TVip> vips = new ArrayList<>();
+ GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
+ getAppUserVipDetail.setAppUserId(userId);
+ getAppUserVipDetail.setVipId(data.getVipId());
+ R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
+ TAppUserVipDetail data1 = appUserVipDetail.getData();
+ String vipJson = data1.getVipJson();
+ TVip tVip = JSON.parseObject(vipJson, TVip.class);
+ vips.add(tVip);
LocalDateTime now = LocalDateTime.now();
for (TVip vip : vips) {
VipInfoDto vipInfoDto = new VipInfoDto();
@@ -255,19 +277,20 @@
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()) {
- for (SendCouponDto sendCouponDto : javaList) {
- VipCouponDto vipCouponDto = new VipCouponDto();
- TCoupon byId = couponService.getById(sendCouponDto.getId());
- vipCouponDto.setNum(sendCouponDto.getNumber());
- vipCouponDto.setTCoupon(byId);
- vipCouponDtos.add(vipCouponDto);
+ if (vip.getCoupon()!=null) {
+ List<SendCouponDto> javaList = JSON.parseArray(vip.getCoupon()).toJavaList(SendCouponDto.class);
+ List<VipCouponDto> vipCouponDtos = new ArrayList<>();
+ if (!javaList.isEmpty()) {
+ for (SendCouponDto sendCouponDto : javaList) {
+ VipCouponDto vipCouponDto = new VipCouponDto();
+ TCoupon byId = couponService.getById(sendCouponDto.getId());
+ vipCouponDto.setNum(sendCouponDto.getNumber());
+ vipCouponDto.setTCoupon(byId);
+ vipCouponDtos.add(vipCouponDto);
+ }
}
- }
- vipInfoDto.setVipCouponDtos(vipCouponDtos);
+ vipInfoDto.setVipCouponDtos(vipCouponDtos);
//计算总折扣
BigDecimal total = BigDecimal.ZERO;
@@ -280,9 +303,14 @@
total.add(tCoupon.getDiscountAmount());
}
}
+
vipInfoDto.setTotalDiscount(total);
+
vipInfoDto.setTimeAmount(vip.getMaximumDeduction().multiply(BigDecimal.valueOf(vip.getDiscountTimes())));
+ }
+ vipInfoDto.setType(vip.getType());
vipInfoDtos.add(vipInfoDto);
+
}
return R.ok(vipInfoDtos);
@@ -309,7 +337,7 @@
switch (buyType){
case 1:
if (byId.getMonthlyCardDiscountStart()!=null&&(now.isAfter(byId.getMonthlyCardDiscountStart())&&now.isBefore(byId.getMonthlyCardDiscountEnd()))){
- payMoney = byId.getMonthlyCard().multiply(byId.getMonthlyCardDiscount());
+ payMoney = byId.getMonthlyCard().multiply(byId.getMonthlyCardDiscount().divide(new BigDecimal(10)));
discountMoney = byId.getMonthlyCard().subtract(payMoney);
discount = byId.getMonthlyCardDiscount();
}else {
@@ -318,7 +346,7 @@
break;
case 2:
if (byId.getSeasonCardDiscountStart()!=null&&(now.isAfter(byId.getSeasonCardDiscountStart())&&now.isBefore(byId.getSeasonCardDiscountEnd()))){
- payMoney = byId.getSeasonCard().multiply(byId.getSeasonCardDiscount());
+ payMoney = byId.getSeasonCard().multiply(byId.getSeasonCardDiscount().divide(new BigDecimal(10)));
discountMoney = byId.getSeasonCard().subtract(payMoney);
discount = byId.getSeasonCardDiscount();
}else {
@@ -327,7 +355,7 @@
break;
case 3:
if (byId.getAnnualCardDiscountStart()!=null&&(now.isAfter(byId.getAnnualCardDiscountStart())&&now.isBefore(byId.getAnnualCardDiscountEnd()))){
- payMoney = byId.getAnnualCard().multiply(byId.getAnnualCardDiscount());
+ payMoney = byId.getAnnualCard().multiply(byId.getAnnualCardDiscount().divide(new BigDecimal(10)));
discountMoney = byId.getAnnualCard().subtract(payMoney);
discount = byId.getAnnualCardDiscount();
}else {
--
Gitblit v1.7.1