diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java index 702def792..9a42ce94e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java @@ -217,10 +217,15 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { queryWrapper.eq(CardFuelRecord::getStoreId,cardFuelRecordDTO.getStoreId()); queryWrapper.eq(CardFuelRecord::getMtUserId,cardFuelRecordDTO.getMtUserId()); List cardFuelRecords = cardFuelRecordMapper.selectList(queryWrapper); - Optional max = cardFuelRecords.stream().min(Comparator.comparing(CardFuelRecord::getLockupPrice)); - CardFuelRecord cardFuelRecord = max.get(); + CardFuelRecord cardFuelRecord = new CardFuelRecord(); + + if (ObjectUtils.isNotEmpty(cardFuelRecords)){ + Optional max = cardFuelRecords.stream().max(Comparator.comparing(CardFuelRecord::getLockupPrice)); + cardFuelRecord = max.get(); + } CardFuelDiesel cardFuelDiesel = cardFuelDieselService.getById(cardFuelRecord.getCardFuelId()); - if ("2".equals(cardFuelDiesel.getActiveTime())){ + + if (ObjectUtils.isNotEmpty(cardFuelDiesel) && "2".equals(cardFuelDiesel.getActiveTime())){ cardFuelRecordDTO.setExpireTime(cardFuelDiesel.getEndTime()); }else { LocalDate today = LocalDate.now(); // 获取当前日期