From a146097a15d719c60af3cdeb4de1f21aa7b5ca8d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:47:53 +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/task/TaskUtil.java | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/task/TaskUtil.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/task/TaskUtil.java
index 4d1a322..0bdf907 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/task/TaskUtil.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/task/TaskUtil.java
@@ -39,23 +39,10 @@
.orderByDesc(TAppUserVipDetail::getStartTime).list();
//判断sendNum是否包括当前月份
for (TAppUserVipDetail recentDetail : recentDetails) {
- if (recentDetail.getSendMonth()!=null&&recentDetail.getSendMonth().contains(monthNum+"")){
- //如果包含，则不执行操作
- continue;
- }else {
- //如果不包含，则更新sendNum，并且赠送优惠卷
- TAppUserVipDetail byId = tAppUserVipDetailService.getById(recentDetail.getId());
- if (byId==null){
- byId.setSendMonth(byId.getSendMonth()+monthNum);
- }else{
- byId.setSendMonth(","+byId.getSendMonth()+monthNum);
- }
-
- tAppUserVipDetailService.updateById(byId);
//赠送优惠卷
- tAppUserVipDetailService.giveVipCoupun(recentDetail.getAppUserId(), recentDetail.getVipId());
- }
+ tAppUserVipDetailService.giveVipCoupun(recentDetail.getAppUserId(), recentDetail.getVipId(),recentDetail.getId(),monthNum);
+
}
} catch (Exception e) {
--
Gitblit v1.7.1