From 228af4d56a2ad7ee4ce5a16149a60f89bda84acf Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 09:16:23 +0800
Subject: [PATCH] 会员支付相关
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java | 2 +-
cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
index fab2ff4..639db2b 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
@@ -272,9 +272,9 @@
if (StringUtils.hasLength(couponJson)) {
grantCoupon.setCouponJson(couponJson);
- grantCoupon.setUserId(vipPayment1.getAppUserId());
- grantCoupon.setVipPaymentId(vipPayment1.getId());
}
+ grantCoupon.setUserId(vipPayment1.getAppUserId());
+ grantCoupon.setVipPaymentId(vipPayment1.getId());
String ticketJson = vipPayment1.getTicketJson();
if (StringUtils.hasLength(ticketJson)) {
grantCoupon.setTicketJson(ticketJson);
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..c99be92 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
@@ -387,7 +387,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