From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 01 九月 2025 15:35:59 +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 | 7 +++++++ 1 files changed, 7 insertions(+), 0 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 59ed6a1..6d2402f 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 @@ -375,6 +375,13 @@ List<VipDetail> list = vipDetailService.lambdaQuery().eq(VipDetail::getVipPaymentId, id).list(); for (VipDetail vipDetail : list) { vipDetail.setStatus(3); + if (vipDetail.getType()==1){ + // 将优惠券修改为过期 + UserCoupon userCoupon = userCouponService.getById(vipDetail.getUserCouponId()); + userCoupon.setUserId(null); + userCoupon.setStatus(3); + userCouponService.updateById(userCoupon); + } } vipDetailService.updateBatchById(list); } -- Gitblit v1.7.1