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/PointMercharsController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 92fb1df..faca698 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));
@@ -852,7 +852,8 @@
}
List<UserCoupon> userCoupons = new ArrayList<>();
if (ids.size() > 0) {
- userCoupons = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", appUserId).in("couponId", ids));
+ userCoupons = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", appUserId).in("couponId", ids)
+ .ne("status",3));
}
if (pointsMerchandises.size() > 0) {
for (UserPointsMerchandise pointsMerchandise : pointsMerchandises) {
@@ -1053,7 +1054,7 @@
detailsResponse.setGoodName(vipDetail.getTicketName());
detailsResponse.setStartTime(simpleDateFormat.format(vipDetail.getStartTime()));
detailsResponse.setEndTime(simpleDateFormat.format(vipDetail.getEndTime()));
- detailsResponse.setUseStatus(vipDetail.getStatus());
+ detailsResponse.setUseStatus(vipDetail.getStatus()==1?2:1);
detailsResponse.setGoodType(3);
// 表明是会员赠送的门票
detailsResponse.setExchangeType(4);
@@ -1110,7 +1111,7 @@
PointDetailsVo detailsVo = new PointDetailsVo();
if (speMercharsId.toString().contains("-1")){
- // 会员门票
+ // 会员优惠券
VipDetail vipDetail = vipDetailService.getById(Math.abs(speMercharsId));
if (vipDetail.getType()==1){
Coupon coupon = iCouponService.getById(vipDetail.getCouponId());
--
Gitblit v1.7.1