From 8759010ef052126b91b9c3825f9a4822ecc5b682 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: Fri, 17 May 2024 10:50:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CardFuelRecordServiceImpl.java       | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

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<CardFuelRecord> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(CardFuelRecord::getStoreId,cardFuelRecordDTO.getStoreId());
+        queryWrapper.eq(CardFuelRecord::getMtUserId,cardFuelRecordDTO.getMtUserId());
+        List<CardFuelRecord> 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())) {