From 8b2e82bc5791cf875f5ec111ace788935c8fec97 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期四, 15 八月 2024 11:57:40 +0800 Subject: [PATCH] 8.15 --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 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 1f503b3..0012af4 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 @@ -3,11 +3,15 @@ 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; 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; @@ -22,6 +26,10 @@ private VipClient vipClient; @Resource private TAppUserVipDetailService tAppUserVipDetailService; + @Resource + private OtherClient otherClient; + @Resource + private TAppCouponService appCouponService; public void sendVip(TAppUser nowUser,Integer vipId,Integer plusDay){ if (nowUser.getVipEndTime()==null||nowUser.getVipEndTime().isBefore(LocalDateTime.now())) { @@ -42,11 +50,31 @@ tAppUserVipDetail.setSendChargeNum(vip.getDiscountTimes()); tAppUserVipDetail.setChargeNum(vip.getDiscountTimes()); tAppUserVipDetail.setDiscountMoney(vip.getMaximumDeduction()); + tAppUserVipDetail.setSendMonth(1); 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 { -- Gitblit v1.7.1