From 9c4b38c6382b2a33d1716c962553ece34e4913f5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 17 十月 2024 10:03:28 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java | 114 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 98 insertions(+), 16 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 6091de5..12dccfc 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,44 +1,126 @@
package com.ruoyi.account.util;
+import com.alibaba.fastjson2.JSON;
+import com.ruoyi.account.api.dto.SendCouponDto;
+import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.account.api.model.TAppUserVipDetail;
+import com.ruoyi.account.service.TAppCouponService;
import com.ruoyi.account.service.TAppUserVipDetailService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.other.api.domain.TCoupon;
+import com.ruoyi.other.api.domain.TVip;
+import com.ruoyi.other.api.feignClient.OtherClient;
+import com.ruoyi.other.api.feignClient.VipClient;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
@Component
public class GiveVipUtil {
+
+ @Resource
+ private VipClient vipClient;
@Resource
private TAppUserVipDetailService tAppUserVipDetailService;
- public void sendVip(TAppUser nowUser,Integer vipId,Integer plusDay){
+ @Resource
+ private OtherClient otherClient;
+ @Resource
+ 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().plusDays(plusDay));
-
+
+ nowUser.setVipEndTime(LocalDateTime.now().plusMonths(plusDay).minusDays(1));
+ nowUser.setVipId(vipId);
//直接再detail里新增数据，因为不是续费
TAppUserVipDetail tAppUserVipDetail = new TAppUserVipDetail();
tAppUserVipDetail.setAppUserId(nowUser.getId());
tAppUserVipDetail.setStartTime(LocalDateTime.now());
- tAppUserVipDetail.setEndTime(LocalDateTime.now().plusDays(plusDay));
+ tAppUserVipDetail.setEndTime(LocalDateTime.now().plusMonths(plusDay).minusDays(1));
tAppUserVipDetail.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);
+ }
+
+ tAppUserVipDetail.setCouponIds(vip.getCoupon());
+ tAppUserVipDetail.setSendChargeNum(vip.getDiscountTimes());
+ 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) {
+ Integer number = sendCouponDto.getNumber();
+ for (Integer i = 0; i < number; i++) {
+
+
+ R<TCoupon> couponById = otherClient.getCouponById(sendCouponDto.getId());
+ TCoupon coupon = couponById.getData();
+ //将该优惠卷添加到用户优惠卷中
+ TAppCoupon tAppCoupon = new TAppCoupon();
+ tAppCoupon.setAppUserId(nowUser.getId());
+ tAppCoupon.setCouponId(Integer.valueOf(sendCouponDto.getId()));
+ if (coupon.getValidityPeriodMode() == 1) {
+ tAppCoupon.setEndTime(coupon.getEndTime());
+ } else {
+ tAppCoupon.setEndTime(LocalDateTime.now().plusDays(coupon.getDays()));
+ }
+ tAppCoupon.setWaysToObtain(4);
+ tAppCoupon.setStatus(1);
+ tAppCoupon.setCouponJson(JSON.toJSONString(coupon));
+ appCouponService.save(tAppCoupon);
+ }
+ }
+
+
}else {
- nowUser.setVipEndTime(nowUser.getVipEndTime().plusDays(plusDay));
+// 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());
- newAppUser.setEndTime(tAppUserVipDetail.getEndTime().plusDays(plusDay));
-
- newAppUser.setVipId(vipId);
- tAppUserVipDetailService.save(newAppUser);
-// 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