From 4f071179af0b0df10a420f92352168e7e2cbc8e2 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: Thu, 25 Jan 2024 16:20:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=88=B8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activeExchange/service/impl/ActiveExchangeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2e19ea5a2..cc68407b1 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 @@ -551,7 +551,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { for (ActiveDiscountPayVO activeDiscountPayVO : activeFuletVOList) { if (!activeDiscountPayVO.getParticipationCondition().equals("1")){ for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) { - if(cardFavorableRecordVO.getType().equals("2") && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){ + if(ObjectUtils.isNotEmpty(cardFavorableRecordVO) && cardFavorableRecordVO.getType().equals("2") && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){ ActiveDiscountPayVO activeDiscountPayVO1 = new ActiveDiscountPayVO(); BeanUtils.copyProperties(activeDiscountPayVO,activeDiscountPayVO1); activeDiscountPayVO1.setCouponId(cardFavorableRecordVO.getId());