From ea4e6cf0a63fa8470846fd5188da9e912faf661e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 01 十一月 2024 10:01:24 +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 | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 bb2f544..1a3c63c 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
@@ -47,10 +47,11 @@
TParkingRecord parkingRecord = new TParkingRecord();
parkingRecord.setLicensePlate(order.getPlate());
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
- String code = "TC" + Math.random() * 1000 + sdf.format(new Date());
+ String code = "TC" + Double.valueOf(Math.random() * 1000).intValue() + sdf.format(new Date());
parkingRecord.setCode(code);
parkingRecord.setVehicleColor(order.getPlateColor());
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")));
parkingRecord.setStatus(1);
@@ -72,6 +73,8 @@
parkingRecord.setOutParkingTime(LocalDateTime.parse(order.getLeaveDateTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
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);
parkingRecordClient.updateParkingRecord(parkingRecord);
@@ -95,10 +98,11 @@
TParkingRecord parkingRecord = new TParkingRecord();
parkingRecord.setLicensePlate(order.getPlatenumber());
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
- String code = "TC" + Math.random() * 1000 + sdf.format(new Date());
+ String code = "TC" + Double.valueOf(Math.random() * 1000).intValue() + sdf.format(new Date());
parkingRecord.setCode(code);
parkingRecord.setVehicleColor(order.getPlatecolor());
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")));
parkingRecord.setStatus(1);
@@ -120,6 +124,7 @@
parkingRecord.setOutParkingTime(LocalDateTime.parse(order.getLeavetime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
parkingRecord.setParkingDuration(Integer.valueOf(order.getLongTime()));
parkingRecord.setOrderAmount(new BigDecimal(order.getMoney()));
+ parkingRecord.setPayment(new BigDecimal(order.getMoney()));
parkingRecordClient.updateParkingRecord(parkingRecord);
}
--
Gitblit v1.7.1