From db5ea69bd9bfca00e72c3d8d3a80bb5db991c75d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 06 一月 2026 14:48:21 +0800
Subject: [PATCH] bug修改 全部代码提交
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 d475fb7..3581e96 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
@@ -67,6 +67,8 @@
private StoreClient storeClient;
@Autowired
private SiteClient siteClient;
+ @Autowired
+ private PointsMerchandiseService pointsMerchandiseService;
@@ -211,8 +213,8 @@
* @param id
* @return
*/
- @GetMapping("/userCoupon/changeTicketStatus/{id}")
- public void changeTicketStatus(@PathVariable("id") String id){
+ @GetMapping("/userCoupon/changeTicketStatus/{id}/{storeId}/{siteId}")
+ public void changeTicketStatus(@PathVariable("id") String id,@PathVariable("storeId") Integer storeId,@PathVariable("siteId") Integer siteId){
System.err.println("数据id"+id);
if (id.length()<=11){
// 购买会员赠送的门票
@@ -222,6 +224,8 @@
if (vipDetail!=null){
System.err.println("修改使用状态");
vipDetail.setStatus(2);
+ vipDetail.setUseStoreId(storeId);
+ vipDetail.setUseSiteId(siteId);
vipDetailService.updateById(vipDetail);
}else{
System.err.println("未查询到会员权益门票数据"+ id);
@@ -232,11 +236,18 @@
UserPointsMerchandise userPointsMerchandise = userPointsMerchandiseService.getById(id);
System.err.println("积分商城门票数据"+ userPointsMerchandise);
if (userPointsMerchandise!=null){
- System.err.println("修改使用状态");
- userPointsMerchandise.setUserId(null);
- userPointsMerchandise.setVerificationTime(new Date());
- userPointsMerchandise.setStatus(2);
- userPointsMerchandiseService.updateById(userPointsMerchandise);
+ PointsMerchandise pointsMerchandise = pointsMerchandiseService.getById(userPointsMerchandise.getPointsMerchandiseId());
+ if (pointsMerchandise!=null){
+ if (pointsMerchandise.getCardType()==1){
+ System.err.println("日卡修改使用状态");
+ userPointsMerchandise.setUserId(null);
+ userPointsMerchandise.setVerificationTime(new Date());
+ userPointsMerchandise.setVerifiStoreId(storeId);
+ userPointsMerchandise.setStatus(2);
+ userPointsMerchandiseService.updateById(userPointsMerchandise);
+ }
+ }
+
}else{
System.err.println("未查询到积分商城门票数据"+ id);
}
--
Gitblit v1.7.1