From 1c842d5a1880469bf1af7067a5c194ae26c3f80d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 19:36:15 +0800
Subject: [PATCH] 惠民卡代码
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
index 13f5e8c..f6ae5b0 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
@@ -263,15 +263,23 @@
List<TPayHuimin> payHuimins = payHuiminService.list(new LambdaQueryWrapper<TPayHuimin>()
.eq(TPayHuimin::getAppUserId, uid)
.ge(TPayHuimin::getEndTime,new Date())
- .eq(TPayHuimin::getStatus, 1));
+ .in(TPayHuimin::getStatus, Arrays.asList(2,3)));
List<HuiminCardVO> huiminCardVOS = new ArrayList<>();
for (THuiminCard huiminCardVO : cardList) {
HuiminCardVO huiminCardVO1 = new HuiminCardVO();
huiminCardVO1.setId(huiminCardVO.getId());
List<TPayHuimin> collect = payHuimins.stream().filter(e -> e.getCardId().equals(huiminCardVO.getId())).collect(Collectors.toList());
if (!collect.isEmpty()){
- huiminCardVO1.setCover(huiminCardVO.getBuyCover());
- huiminCardVO1.setIsBuy(1);
+ for (TPayHuimin tPayHuimin : collect) {
+ if (tPayHuimin.getStatus().equals(2)){
+ huiminCardVO1.setCover(huiminCardVO.getBuyCover());
+ huiminCardVO1.setIsBuy(1);
+ break;
+ }else{
+ huiminCardVO1.setCover(huiminCardVO.getUnBuyCover());
+ huiminCardVO1.setIsBuy(0);
+ }
+ }
}else{
huiminCardVO1.setCover(huiminCardVO.getUnBuyCover());
huiminCardVO1.setIsBuy(0);
--
Gitblit v1.7.1