From 4c96637a005891c709662ae84edd072ad9a4a57d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 08 十月 2024 15:13:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserVipDetailServiceImpl.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserVipDetailServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserVipDetailServiceImpl.java
index c38b1d6..b5907d9 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserVipDetailServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserVipDetailServiceImpl.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.dto.SendCouponDto;
-import com.ruoyi.account.api.feignClient.AppCouponClient;
import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUserVipDetail;
import com.ruoyi.account.mapper.TAppUserVipDetailMapper;
@@ -11,9 +10,7 @@
import com.ruoyi.account.service.TAppCouponService;
import com.ruoyi.account.service.TAppUserVipDetailService;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.domain.AjaxResult;
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.Service;
@@ -48,19 +45,19 @@
public void giveVipCoupun(Long appUserId, Integer vipId,Long recordId,Integer monthNum) {
//如果不包含，则更新sendNum，并且赠送优惠卷
TAppUserVipDetail byId = tAppUserVipDetailService.getById(recordId);
- if (byId.getStartTime().toLocalDate().plusMonths(byId.getSendMonth()).compareTo(LocalDate.now())==0&&LocalDate.now().isBefore(byId.getEndTime().toLocalDate())){
+ if (byId.getStartTime().plusMonths(byId.getSendMonth()).toLocalDate().compareTo(LocalDate.now())==0&&LocalDate.now().isBefore(byId.getEndTime().toLocalDate())){
byId.setSendMonth(byId.getSendMonth()+1);
//给这个用户发放对应vip的优惠卷以及充电次数加满
-
- if (byId.getCouponIds()!=null) {
- String[] sendList = byId.getCouponIds().split(",");
- for (String sendCouponDto : sendList) {
- R<TCoupon> couponById = otherClient.getCouponById(Integer.valueOf(sendCouponDto));
+ List<SendCouponDto> javaList = JSON.parseArray(byId.getCouponIds()).toJavaList(SendCouponDto.class);
+ 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(appUserId);
- tAppCoupon.setCouponId(Integer.valueOf(sendCouponDto));
+ tAppCoupon.setCouponId(sendCouponDto.getId());
if (coupon.getValidityPeriodMode() == 1) {
tAppCoupon.setEndTime(coupon.getEndTime());
} else {
@@ -71,9 +68,11 @@
tAppCoupon.setCouponJson(JSON.toJSONString(coupon));
appCouponService.save(tAppCoupon);
}
+ }
+
}
byId.setChargeNum(byId.getSendChargeNum());
tAppUserVipDetailService.updateById(byId);
}
- }
+
}
--
Gitblit v1.7.1