From acc85b1fa6f210f2eae2e35fc7c43ab91f88a72e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Sat, 20 Jan 2024 12:01:11 +0800 Subject: [PATCH] 111 --- .../activeExchange/dto/PaymentActiveDTO.java | 2 +- .../service/impl/ActiveExchangeServiceImpl.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/dto/PaymentActiveDTO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/dto/PaymentActiveDTO.java index 846669931..86d93828c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/dto/PaymentActiveDTO.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/dto/PaymentActiveDTO.java @@ -7,7 +7,7 @@ import java.math.BigDecimal; @Data public class PaymentActiveDTO implements Serializable { - //支付类型 0：储值卡 1：囤油卡 2：现金 + //支付类型 0：储值卡 1：没用储值卡 private String type; //支付金额 private BigDecimal amount; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java index 24e188453..f494255fd 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java @@ -451,6 +451,11 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { //优惠券 paymentActiveDTO.setUserId(userId); List canUserCardFavorableList = cardFavorableRecordMapper.getCanUserCardFavorableList(paymentActiveDTO); + //如果是储值卡付款，直接过滤掉 + if(paymentActiveDTO.getType().equals("0")){ + canUserCardFavorableList = canUserCardFavorableList.stream().filter(cardFavorableRecordVO -> cardFavorableRecordVO.getExclusiveFunction().equals("1")) + .collect(Collectors.toList()); + } //会员等级当前优惠力度最大 //无限制条件的活动列表