From 5a8ca3190f436f4ac4a4bfb7d19da62bc25379d4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 09:39:14 +0800
Subject: [PATCH] 会员支付相关
---
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java | 6 ++----
cloud-server-activity/src/main/java/com/dsh/activity/entity/UserCoupon.java | 5 +++++
cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java | 2 ++
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java | 19 ++++++++-----------
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java | 2 +-
5 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java
index 4f49cfb..cef1c70 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java
@@ -22,7 +22,7 @@
@ApiModelProperty(value = "现金")
private BigDecimal cash;
- @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金 3=会员赠送)")
+ @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金 3=现金 4=会员赠送 当该字段为4时 展示的二维码内容增加一个vipDetail:当前数据id)")
private Integer exchangeType;
@ApiModelProperty(value = "有效期开始时间")
@@ -43,9 +43,7 @@
private List<Integer> rid;
private List<Integer> sid;
- @ApiModelProperty(value = "当exchangeType=3会员赠送时存储1 门票二维码格式内容新增该字段 用于标明该门票为会员赠送" +
- "，使用时存储门票记录")
- private Integer isVipCode;
+
@ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡")
private Integer cardType;
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java
index e4fb4f5..05af436 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java
@@ -2,6 +2,7 @@
import com.dsh.activity.entity.THuiminRecord;
import com.dsh.activity.entity.TPayHuimin;
+import com.dsh.activity.entity.VipDetail;
import com.dsh.activity.service.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,6 +23,8 @@
private HuiminRecordService huiminRecordService;
@Resource
private PayHuiminService payHuiminService;
+ @Resource
+ private VipDetailService vipDetailService;
/**
* 硬件开门后回调 存储玩湃惠民卡使用记录
*/
@@ -44,18 +47,12 @@
* 硬件开门后回调 存储会员使用明细
*/
@PostMapping("/recordVipDetail")
- public void recordVipDetail(Integer id,Integer uid) {
+ public void recordVipDetail(Integer id,Integer rid,Integer sid) {
System.err.println("硬件开门后回调 存储会员卡门票权益使用记录");
System.err.println("id:"+id);
- System.err.println("uid:"+uid);
- if (id!=null){
- THuiminRecord huiminRecord = new THuiminRecord();
- TPayHuimin payHuimin = payHuiminService.getById(id);
- huiminRecord.setPayId(id);
- huiminRecord.setHuiminCardId(payHuimin.getCardId());
- huiminRecord.setInsertTime(new Date());
- huiminRecord.setAppUserId(uid);
- huiminRecordService.save(huiminRecord);
- }
+ System.err.println("rid:"+rid);
+ System.err.println("sid:"+sid);
+ VipDetail vipDetailServiceById = vipDetailService.getById(id);
+
}
}
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 c99be92..d1b71e2 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,8 @@
vipDetail.setCouponId(Integer.valueOf(id));
vipDetail.setUserCouponId(userCoupon.getId());
vipDetailService.save(vipDetail);
+ userCoupon.setVipDetailId(vipDetail.getId());
+ userCouponService.updateById(userCoupon);
}
}
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserCoupon.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserCoupon.java
index 349a798..c77b6b8 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserCoupon.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserCoupon.java
@@ -71,6 +71,11 @@
*/
@TableField("isVipGrant")
private Integer isVipGrant;
+ /**
+ * vipDetailId 会员权益赠送记录id
+ */
+ @TableField("vipDetailId")
+ private Integer vipDetailId;
@Override
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java
index 7242507..6c6c1bb 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java
@@ -22,7 +22,7 @@
@ApiModelProperty(value = "现金")
private BigDecimal cash;
- @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金 3=现金 4=会员赠送 当该字段为4时 展示的二维码内容增加一个id:当前数据id)")
+ @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金 3=现金 4=会员赠送 当该字段为4时 展示的二维码内容增加一个vipDetail:当前数据id)")
private Integer exchangeType;
@ApiModelProperty(value = "有效期开始时间")
--
Gitblit v1.7.1