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 5f41ff08a..52628c990 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 @@ -211,6 +211,29 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { cardFuelRecordDTO.setStoreId(nowAccountInfo.getStoreId()); cardFuelRecordDTO.setChainStoreId(nowAccountInfo.getChainStoreId()); cardFuelRecordDTO.setPayAmount(cardFuelRecordDTO.getRechargeBalance()); + + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CardFuelRecord::getStoreId,cardFuelRecordDTO.getStoreId()); + queryWrapper.eq(CardFuelRecord::getMtUserId,cardFuelRecordDTO.getMtUserId()); + List cardFuelRecords = cardFuelRecordMapper.selectList(queryWrapper); + if (ObjectUtils.isNotEmpty(cardFuelRecords)){ + Integer cardFuelId = cardFuelRecords.get(0).getCardFuelId(); + CardFuelDiesel cardFuelDiesel = cardFuelDieselService.getById(cardFuelId); + if ("2".equals(cardFuelDiesel.getActiveTime())){ + cardFuelRecordDTO.setExpireTime(cardFuelDiesel.getEndTime()); + }else { + LocalDate today = LocalDate.now(); // 获取当前日期 + Period tenYears = Period.ofYears(10); // 创建一个10年的时间段 + LocalDate tenYearsLater = today.plus(tenYears); + Instant instant1 = Timestamp.valueOf(tenYearsLater.atTime(LocalTime.MIDNIGHT)).toInstant(); + Date from = Date.from(instant1); + cardFuelRecordDTO.setExpireTime(from); + } + } + + + cardFuelRecordDTO.setExpireTime(cardFuelRecordDTO.getExpireTime()); if (ObjectUtil.isEmpty(cardFuelRecordDTO.getMtStaffId())) {