From f38d69d70e3e126d2f58971d0b4854f2aa144fc1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 22 八月 2025 14:40:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
index 4f062f7..3963a6a 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
@@ -359,6 +359,9 @@
vipDetail.setCouponId(Integer.valueOf(id));
vipDetail.setUserCouponId(userCoupon.getId());
vipDetailService.save(vipDetail);
+ userCoupon.setVipDetailId(vipDetail.getId());
+ userCoupon.setUserId(null);
+ userCouponService.updateById(userCoupon);
}
}
}
@@ -387,7 +390,7 @@
vipDetail.setAppUserId(grantCoupon.getUserId());
vipDetail.setStatus(1);
vipDetail.setInsertTime(new Date());
- vipDetail.setVipId(grantCoupon.getVipPaymentId());
+ vipDetail.setVipId(grantCoupon.getVipId());
vipDetail.setType(2);
vipDetail.setVipPaymentId(grantCoupon.getVipPaymentId());
vipDetailService.save(vipDetail);
--
Gitblit v1.7.1