From 9f781b1841fb490179918e844bdd6ddd1773e441 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 08 十月 2024 13:34:19 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java
index b6ef577..b33e709 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java
@@ -31,11 +31,11 @@
private OtherClient otherClient;
@Resource
private TAppCouponService appCouponService;
- public void sendVip(TAppUser nowUser,Integer vipId,Integer plusDay){
+ public void sendVip(TAppUser nowUser,Integer vipId,Integer plusDay,Integer type){
if (nowUser.getVipEndTime()==null||nowUser.getVipEndTime().isBefore(LocalDateTime.now())) {
- nowUser.setVipEndTime(LocalDateTime.now().plusMonths(plusDay));
-
+ nowUser.setVipEndTime(LocalDateTime.now().plusMonths(plusDay).minusDays(1));
+ nowUser.setVipId(vipId);
//直接再detail里新增数据，因为不是续费
TAppUserVipDetail tAppUserVipDetail = new TAppUserVipDetail();
tAppUserVipDetail.setAppUserId(nowUser.getId());
@@ -55,6 +55,8 @@
tAppUserVipDetail.setChargeNum(vip.getDiscountTimes());
tAppUserVipDetail.setDiscountMoney(vip.getMaximumDeduction());
tAppUserVipDetail.setSendMonth(1);
+ tAppUserVipDetail.setVipJson(JSON.toJSONString(info.getData()));
+ tAppUserVipDetail.setVipType(type);
tAppUserVipDetailService.save(tAppUserVipDetail);
//直接赠送优惠卷
for (SendCouponDto sendCouponDto : javaList) {
@@ -82,18 +84,44 @@
}else {
- nowUser.setVipEndTime(nowUser.getVipEndTime().plusDays(plusDay).minusDays(1));
+// nowUser.setVipEndTime(nowUser.getVipEndTime().plusDays(plusDay).minusDays(1));
//获取detail里结束时间大于当前时间的数据，并将enttime延长
- TAppUserVipDetail tAppUserVipDetail = tAppUserVipDetailService.lambdaQuery().eq(TAppUserVipDetail::getAppUserId, nowUser.getId()).orderByDesc(TAppUserVipDetail::getEndTime).last("limit 1").one();
-
-// TAppUserVipDetail newAppUser = new TAppUserVipDetail();
-// newAppUser.setAppUserId(nowUser.getId());
-// newAppUser.setStartTime(tAppUserVipDetail.getEndTime());
- tAppUserVipDetail.setEndTime(tAppUserVipDetail.getEndTime().plusMonths(plusDay).minusDays(1));
-// newAppUser.setVipId(vipId);
- tAppUserVipDetailService.updateById(tAppUserVipDetail);
-// tAppUserVipDetail.setEndTime(tAppUserVipDetail.getEndTime().plusDays(plusDay));
+// TAppUserVipDetail tAppUserVipDetail = tAppUserVipDetailService.lambdaQuery().eq(TAppUserVipDetail::getVipId,vipId).eq(TAppUserVipDetail::getAppUserId, nowUser.getId()).orderByDesc(TAppUserVipDetail::getEndTime).last("limit 1").one();
+// if (tAppUserVipDetail!=null) {
+// List<TAppUserVipDetail> list = tAppUserVipDetailService.lambdaQuery().eq(TAppUserVipDetail::getAppUserId, nowUser.getId()).ge(TAppUserVipDetail::getStartTime, tAppUserVipDetail.getEndTime()).list();
+// for (TAppUserVipDetail appUserVipDetail : list) {
+// appUserVipDetail.setStartTime(appUserVipDetail.getStartTime().plusMonths(plusDay).minusDays(1));
+// appUserVipDetail.setEndTime(appUserVipDetail.getEndTime().plusMonths(plusDay).minusDays(1));
+// }
+// tAppUserVipDetailService.updateBatchById(list);
+// tAppUserVipDetail.setEndTime(tAppUserVipDetail.getEndTime().plusMonths(plusDay).minusDays(1));
+//
// tAppUserVipDetailService.updateById(tAppUserVipDetail);
+// }else
+// {
+ TAppUserVipDetail tAppUserVipDetail2 = tAppUserVipDetailService.lambdaQuery().eq(TAppUserVipDetail::getAppUserId, nowUser.getId()).orderByDesc(TAppUserVipDetail::getEndTime).last("limit 1").one();
+
+ TAppUserVipDetail tAppUserVipDetail1 = new TAppUserVipDetail();
+ tAppUserVipDetail1.setAppUserId(nowUser.getId());
+ tAppUserVipDetail1.setStartTime(tAppUserVipDetail2.getEndTime());
+ tAppUserVipDetail1.setEndTime(tAppUserVipDetail2.getEndTime().plusMonths(plusDay).minusDays(1));
+ tAppUserVipDetail1.setVipId(vipId);
+
+ R<TVip> info = vipClient.getInfo1(vipId);
+ TVip vip = info.getData();
+
+
+ tAppUserVipDetail1.setCouponIds(vip.getCoupon());
+ tAppUserVipDetail1.setSendChargeNum(vip.getDiscountTimes());
+ tAppUserVipDetail1.setChargeNum(vip.getDiscountTimes());
+ tAppUserVipDetail1.setDiscountMoney(vip.getMaximumDeduction());
+ tAppUserVipDetail1.setSendMonth(1);
+ tAppUserVipDetail1.setVipType(type);
+ tAppUserVipDetail1.setVipJson(JSON.toJSONString(info.getData()));
+ tAppUserVipDetailService.save(tAppUserVipDetail1);
+
+// }
+
}
}
--
Gitblit v1.7.1