From 29e40a41323b09d7fd228e5cec96c3fed450eb3c 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, 11 May 2024 08:38:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A4=E6=B2=B9=E9=94=81=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/CardFuelRecordServiceImpl.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
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 52e8729a4..5f41ff08a 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
@@ -64,11 +64,16 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.sql.Timestamp;
import java.text.SimpleDateFormat;
+import java.time.Instant;
import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.Period;
import java.util.*;
import java.util.concurrent.TimeUnit;
+
/**
* 燃油充值表(CardFuelRecord)表服务实现类
*
@@ -496,7 +501,16 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
//查询囤油卡信息
CardFuelDiesel cardFuelDiesel = cardFuelDieselService.getById(cardFuelRecordDTO.getId());
cardFuleOrders.setCardFuleId(cardFuelDiesel.getId());
- cardFuleOrders.setExpireTime(cardFuelDiesel.getExpireTime());
+ if ("2".equals(cardFuelDiesel.getActiveTime())){
+ cardFuleOrders.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);
+ cardFuleOrders.setExpireTime(from);
+ }
cardFuleOrders.setAmount(cardFuelDiesel.getRechargeBalance());
cardFuleOrders.setPayAmount(cardFuelDiesel.getRechargeBalance());
cardFuleOrders.setPoints(cardFuelDiesel.getPoints());