From 156b3bc3387f2eb2d2815dfc33a86590dbe5d002 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 26 八月 2025 22:06:08 +0800
Subject: [PATCH] 硬件回调
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 96ea547..231fef5 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -838,7 +838,7 @@
public ExchangeDetailsVo getIntegralExchangeDetails(@RequestBody Integer appUserId) {
ExchangeDetailsVo detailsVo = new ExchangeDetailsVo();
List<ExchangeDetailsResponse> responses = new ArrayList<>();
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<UserPointsMerchandise> pointsMerchandises = upmseService.list(new QueryWrapper<UserPointsMerchandise>()
.eq("userId", appUserId).eq("payStatus", 2));
@@ -1038,7 +1038,6 @@
}
- detailsResponse.setIsVipCode(0);
responses.add(detailsResponse);
}
detailsVo.setDetailsResponses(responses);
@@ -1054,11 +1053,10 @@
detailsResponse.setGoodName(vipDetail.getTicketName());
detailsResponse.setStartTime(simpleDateFormat.format(vipDetail.getStartTime()));
detailsResponse.setEndTime(simpleDateFormat.format(vipDetail.getEndTime()));
- detailsResponse.setIsVipCode(1);
- detailsResponse.setUseStatus(vipDetail.getStatus());
+ detailsResponse.setUseStatus(vipDetail.getStatus()==1?2:1);
detailsResponse.setGoodType(3);
// 表明是会员赠送的门票
- detailsResponse.setExchangeType(3);
+ detailsResponse.setExchangeType(4);
// 全国通用
detailsResponse.setRid(Collections.singletonList(0));
detailsResponse.setSid(Collections.singletonList(0));
@@ -1085,13 +1083,12 @@
detailsResponse.setCash(c.getCash());
}
if (userCoupon.getIsVipGrant()!=null && userCoupon.getIsVipGrant()==1){
- detailsResponse.setExchangeType(3);
+ detailsResponse.setExchangeType(4);
}
detailsResponse.setStartTime(simpleDateFormat.format(c.getStartTime()));
detailsResponse.setEndTime(simpleDateFormat.format(c.getEndTime()));
detailsResponse.setUseStatus(userCoupon.getStatus() == 1 ? 2 : 1);
detailsResponse.setGoodType(4);
- detailsResponse.setIsVipCode(0);
responses.add(detailsResponse);
}
Comparator<ExchangeDetailsResponse> comparator = Comparator.comparing(ExchangeDetailsResponse::getStartTime).reversed();
--
Gitblit v1.7.1