From 4bd5eb33095a9c61ffdc257bb1eb1ce1663cd26c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 20:23:08 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java | 22 ++++++++++++++++++----
1 files changed, 18 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 1a3c63c..e5e32fb 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,9 @@
TParkingLot data = parkingLotClient.getParkingLotByAppKey(order.getAppkey()).getData();
parkingRecord.setName(data.getName());
parkingRecord.setParkingLotId(data.getId());
- parkingRecord.setInParkingTime(LocalDateTime.parse(order.getEnterDateTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ LocalDateTime parse = LocalDateTime.parse(order.getEnterDateTime(), DateTimeFormatter.ISO_DATE_TIME);
+ parse = parse.plusHours(8);
+ parkingRecord.setInParkingTime(parse);
parkingRecord.setStatus(1);
parkingRecord.setCreateTime(LocalDateTime.now());
parkingRecord.setSerialnumber(order.getId());
@@ -70,13 +72,17 @@
query.setLicensePlate(order.getPlate());
query.setStatus(1);
TParkingRecord parkingRecord = parkingRecordClient.getParkingRecord(query).getData();
- parkingRecord.setOutParkingTime(LocalDateTime.parse(order.getLeaveDateTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ LocalDateTime parse = LocalDateTime.parse(order.getLeaveDateTime(), DateTimeFormatter.ISO_DATE_TIME);
+ parse = parse.plusHours(8);
+ parkingRecord.setOutParkingTime(parse);
parkingRecord.setParkingDuration(Integer.valueOf(order.getLongTime()));
parkingRecord.setOrderAmount(new BigDecimal(order.getReceivable()));
parkingRecord.setPayment(new BigDecimal(order.getPayment()));
parkingRecord.setPayType(order.getPayType());
BigDecimal payment = new BigDecimal(order.getPayment());
parkingRecord.setStatus(BigDecimal.ZERO.compareTo(payment) == 0 ? 2 : 3);
+ parkingRecord.setOutParkingType(BigDecimal.ZERO.compareTo(payment) == 0 ? 2 : 1);
+ parkingRecord.setTitle("【停车缴费】" + payment + "元");
parkingRecordClient.updateParkingRecord(parkingRecord);
}
@@ -104,7 +110,9 @@
TParkingLot data = parkingLotClient.getParkingLotByAppKey(order.getAppkey()).getData();
parkingRecord.setName(data.getName());
parkingRecord.setParkingLotId(data.getId());
- parkingRecord.setInParkingTime(LocalDateTime.parse(order.getEntertime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ LocalDateTime parse = LocalDateTime.parse(order.getEntertime(), DateTimeFormatter.ISO_DATE_TIME);
+ parse = parse.plusHours(8);
+ parkingRecord.setInParkingTime(parse);
parkingRecord.setStatus(1);
parkingRecord.setCreateTime(LocalDateTime.now());
parkingRecord.setSerialnumber(order.getId());
@@ -121,10 +129,16 @@
query.setLicensePlate(order.getPlatenumber());
query.setStatus(1);
TParkingRecord parkingRecord = parkingRecordClient.getParkingRecord(query).getData();
- parkingRecord.setOutParkingTime(LocalDateTime.parse(order.getLeavetime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ LocalDateTime parse = LocalDateTime.parse(order.getLeavetime(), DateTimeFormatter.ISO_DATE_TIME);
+ parse = parse.plusHours(8);
+ parkingRecord.setOutParkingTime(parse);
parkingRecord.setParkingDuration(Integer.valueOf(order.getLongTime()));
parkingRecord.setOrderAmount(new BigDecimal(order.getMoney()));
parkingRecord.setPayment(new BigDecimal(order.getMoney()));
+ BigDecimal payment = new BigDecimal(order.getMoney());
+ parkingRecord.setStatus(BigDecimal.ZERO.compareTo(payment) == 0 ? 2 : 3);
+ parkingRecord.setOutParkingType(BigDecimal.ZERO.compareTo(payment) == 0 ? 2 : 1);
+ parkingRecord.setTitle("【停车缴费】" + payment + "元");
parkingRecordClient.updateParkingRecord(parkingRecord);
}
--
Gitblit v1.7.1