From 5b64f31f1d35b38b51935b5fa7f4b8cf46fbf4cf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 08 五月 2025 14:08:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 1.1
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java | 71 +++++++++++++----------------------
1 files changed, 26 insertions(+), 45 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 ef92923..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
@@ -1,7 +1,6 @@
package com.ruoyi.account.util;
import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
import com.ruoyi.account.api.dto.SendCouponDto;
import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUser;
@@ -31,16 +30,15 @@
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.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);
@@ -55,6 +53,10 @@
tAppUserVipDetail.setChargeNum(vip.getDiscountTimes());
tAppUserVipDetail.setDiscountMoney(vip.getMaximumDeduction());
tAppUserVipDetail.setSendMonth(1);
+ 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) {
@@ -76,50 +78,29 @@
tAppCoupon.setWaysToObtain(4);
tAppCoupon.setStatus(1);
tAppCoupon.setCouponJson(JSON.toJSONString(coupon));
+ tAppCoupon.setDetailId(tAppUserVipDetail.getId());
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();
- List<SendCouponDto> javaList = new ArrayList<>();
- if (vip.getCoupon()!=null) {
- javaList = JSON.parseArray(vip.getCoupon()).toJavaList(SendCouponDto.class);
- }
-
- tAppUserVipDetail1.setCouponIds(vip.getCoupon());
- tAppUserVipDetail1.setSendChargeNum(vip.getDiscountTimes());
- tAppUserVipDetail1.setChargeNum(vip.getDiscountTimes());
- tAppUserVipDetail1.setDiscountMoney(vip.getMaximumDeduction());
- tAppUserVipDetail1.setSendMonth(1);
- tAppUserVipDetailService.save(tAppUserVipDetail1);
-
- }
-
+ 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));
+ 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()));
+ tAppUserVipDetail1.setCreateTime(LocalDateTime.now());
+ tAppUserVipDetail1.setMonthEndTime(LocalDateTime.now().plusMonths(1));
+ tAppUserVipDetailService.save(tAppUserVipDetail1);
}
}
--
Gitblit v1.7.1