From 94b2cfe8cdb5e8c343485b46921b554b192e1c7a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 十一月 2024 18:22:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
index 42bb861..55169f6 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
@@ -53,7 +53,7 @@
TParkingLot data = parkingLotClient.getParkingLotByAppKey(order.getAppkey()).getData();
parkingRecord.setName(data.getName());
parkingRecord.setParkingLotId(data.getId());
- LocalDateTime parse = LocalDateTime.parse(order.getEnterDateTime(), DateTimeFormatter.ofPattern("yyyy-MM-ddTHH:mm:ss.SSSZ"));
+ LocalDateTime parse = LocalDateTime.parse(order.getEnterDateTime(), DateTimeFormatter.ISO_INSTANT);
parse.plusDays(8);
parkingRecord.setInParkingTime(parse);
parkingRecord.setStatus(1);
@@ -72,7 +72,7 @@
query.setLicensePlate(order.getPlate());
query.setStatus(1);
TParkingRecord parkingRecord = parkingRecordClient.getParkingRecord(query).getData();
- LocalDateTime parse = LocalDateTime.parse(order.getLeaveDateTime(), DateTimeFormatter.ofPattern("yyyy-MM-ddTHH:mm:ss.SSSZ"));
+ LocalDateTime parse = LocalDateTime.parse(order.getLeaveDateTime(), DateTimeFormatter.ISO_INSTANT);
parse.plusDays(8);
parkingRecord.setOutParkingTime(parse);
parkingRecord.setParkingDuration(Integer.valueOf(order.getLongTime()));
@@ -108,7 +108,7 @@
TParkingLot data = parkingLotClient.getParkingLotByAppKey(order.getAppkey()).getData();
parkingRecord.setName(data.getName());
parkingRecord.setParkingLotId(data.getId());
- LocalDateTime parse = LocalDateTime.parse(order.getEntertime(), DateTimeFormatter.ofPattern("yyyy-MM-ddTHH:mm:ss.SSSZ"));
+ LocalDateTime parse = LocalDateTime.parse(order.getEntertime(), DateTimeFormatter.ISO_INSTANT);
parse.plusDays(8);
parkingRecord.setInParkingTime(parse);
parkingRecord.setStatus(1);
@@ -127,7 +127,7 @@
query.setLicensePlate(order.getPlatenumber());
query.setStatus(1);
TParkingRecord parkingRecord = parkingRecordClient.getParkingRecord(query).getData();
- LocalDateTime parse = LocalDateTime.parse(order.getLeavetime(), DateTimeFormatter.ofPattern("yyyy-MM-ddTHH:mm:ss.SSSZ"));
+ LocalDateTime parse = LocalDateTime.parse(order.getLeavetime(), DateTimeFormatter.ISO_INSTANT);
parse.plusDays(8);
parkingRecord.setOutParkingTime(parse);
parkingRecord.setParkingDuration(Integer.valueOf(order.getLongTime()));
--
Gitblit v1.7.1