From 74b0e0814e37d640596f44ec86d20fa9ecce9ed6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 10:42:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java | 57 +++++++++++++++++----------------------------------------
1 files changed, 17 insertions(+), 40 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 2e9bd75..70dda50 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
@@ -32,7 +32,6 @@
private TAppCouponService appCouponService;
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).minusDays(1));
nowUser.setVipId(vipId);
//直接再detail里新增数据，因为不是续费
@@ -56,6 +55,7 @@
tAppUserVipDetail.setSendMonth(1);
tAppUserVipDetail.setVipJson(JSON.toJSONString(info.getData()));
tAppUserVipDetail.setVipType(type);
+ tAppUserVipDetail.setCreateTime(LocalDateTime.now());
tAppUserVipDetailService.save(tAppUserVipDetail);
//直接赠送优惠卷
for (SendCouponDto sendCouponDto : javaList) {
@@ -81,47 +81,24 @@
appCouponService.save(tAppCoupon);
}
}
-
-
}else {
-// nowUser.setVipEndTime(nowUser.getVipEndTime().plusDays(plusDay).minusDays(1));
- //获取detail里结束时间大于当前时间的数据，并将enttime延长
-// 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);
+ 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);
-
-// }
-
+ tAppUserVipDetail1.setVipJson(JSON.toJSONString(info.getData()));
+ tAppUserVipDetail1.setCreateTime(LocalDateTime.now());
+ tAppUserVipDetailService.save(tAppUserVipDetail1);
}
}
--
Gitblit v1.7.1