From 77b88bd856c598eaa49121eac7848f9f0935eb4a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 09 六月 2025 16:45:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 70dda50..48eed5f 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,13 +32,13 @@
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.setVipEndTime(LocalDateTime.now().plusMonths(plusDay));
nowUser.setVipId(vipId);
//直接再detail里新增数据，因为不是续费
TAppUserVipDetail tAppUserVipDetail = new TAppUserVipDetail();
tAppUserVipDetail.setAppUserId(nowUser.getId());
tAppUserVipDetail.setStartTime(LocalDateTime.now());
- tAppUserVipDetail.setEndTime(LocalDateTime.now().plusMonths(plusDay).minusDays(1));
+ tAppUserVipDetail.setEndTime(LocalDateTime.now().plusMonths(plusDay));
tAppUserVipDetail.setVipId(vipId);
R<TVip> info = vipClient.getInfo1(vipId);
@@ -56,6 +56,7 @@
tAppUserVipDetail.setVipJson(JSON.toJSONString(info.getData()));
tAppUserVipDetail.setVipType(type);
tAppUserVipDetail.setCreateTime(LocalDateTime.now());
+ tAppUserVipDetail.setMonthEndTime(LocalDateTime.now().plusMonths(1));
tAppUserVipDetailService.save(tAppUserVipDetail);
//直接赠送优惠卷
for (SendCouponDto sendCouponDto : javaList) {
@@ -86,7 +87,7 @@
TAppUserVipDetail tAppUserVipDetail1 = new TAppUserVipDetail();
tAppUserVipDetail1.setAppUserId(nowUser.getId());
tAppUserVipDetail1.setStartTime(tAppUserVipDetail2.getEndTime());
- tAppUserVipDetail1.setEndTime(tAppUserVipDetail2.getEndTime().plusMonths(plusDay).minusDays(1));
+ tAppUserVipDetail1.setEndTime(tAppUserVipDetail2.getEndTime().plusMonths(plusDay));
tAppUserVipDetail1.setVipId(vipId);
R<TVip> info = vipClient.getInfo1(vipId);
TVip vip = info.getData();
@@ -98,6 +99,7 @@
tAppUserVipDetail1.setVipType(type);
tAppUserVipDetail1.setVipJson(JSON.toJSONString(info.getData()));
tAppUserVipDetail1.setCreateTime(LocalDateTime.now());
+ tAppUserVipDetail1.setMonthEndTime(LocalDateTime.now().plusMonths(1));
tAppUserVipDetailService.save(tAppUserVipDetail1);
}
--
Gitblit v1.7.1