From f47d695f19bca1e58ddedcc10f8d3dff7d7f8f1d Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 21 八月 2024 11:39:43 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 0012af4..a20ac1c 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
@@ -42,7 +42,7 @@
tAppUserVipDetail.setEndTime(LocalDateTime.now().plusMonths(plusDay).minusDays(1));
tAppUserVipDetail.setVipId(vipId);
- R<TVip> info = vipClient.getInfo(vipId);
+ R<TVip> info = vipClient.getInfo1(vipId);
TVip vip = info.getData();
List<SendCouponDto> javaList = JSON.parseArray(vip.getCoupon()).toJavaList(SendCouponDto.class);
@@ -82,12 +82,12 @@
//获取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());
- newAppUser.setEndTime(tAppUserVipDetail.getEndTime().plusMonths(plusDay).minusDays(1));
- newAppUser.setVipId(vipId);
- tAppUserVipDetailService.save(newAppUser);
+// 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));
// tAppUserVipDetailService.updateById(tAppUserVipDetail);
}
--
Gitblit v1.7.1