From ca825fdfe67223b2eb8a3f9c14b4e60e2339efc6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 25 九月 2024 11:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java | 2 ++
1 files changed, 2 insertions(+), 0 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..4090c02 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
@@ -55,6 +55,7 @@
tAppUserVipDetail.setChargeNum(vip.getDiscountTimes());
tAppUserVipDetail.setDiscountMoney(vip.getMaximumDeduction());
tAppUserVipDetail.setSendMonth(1);
+ tAppUserVipDetail.setVipJson(JSON.toJSONString(info.getData()));
tAppUserVipDetailService.save(tAppUserVipDetail);
//直接赠送优惠卷
for (SendCouponDto sendCouponDto : javaList) {
@@ -116,6 +117,7 @@
tAppUserVipDetail1.setChargeNum(vip.getDiscountTimes());
tAppUserVipDetail1.setDiscountMoney(vip.getMaximumDeduction());
tAppUserVipDetail1.setSendMonth(1);
+ tAppUserVipDetail.setVipJson(JSON.toJSONString(info.getData()));
tAppUserVipDetailService.save(tAppUserVipDetail1);
}
--
Gitblit v1.7.1