合并代码

Pu Zhibing

2024-11-01 a8996df2df6a108be7db1cdb42cee31e12d59245

 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.ofPattern("yyyy-MM-ddTHH:mm:ss.SSSZ"));
      parse.plusDays(8);
      parkingRecord.setInParkingTime(parse);
      parkingRecord.setStatus(1);
      parkingRecord.setCreateTime(LocalDateTime.now());
      parkingRecord.setSerialnumber(order.getId());
@@ -70,7 +72,9 @@
      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.ofPattern("yyyy-MM-ddTHH:mm:ss.SSSZ"));
      parse.plusDays(8);
      parkingRecord.setOutParkingTime(parse);
      parkingRecord.setParkingDuration(Integer.valueOf(order.getLongTime()));
      parkingRecord.setOrderAmount(new BigDecimal(order.getReceivable()));
      parkingRecord.setPayment(new BigDecimal(order.getPayment()));
@@ -104,7 +108,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.ofPattern("yyyy-MM-ddTHH:mm:ss.SSSZ"));
      parse.plusDays(8);
      parkingRecord.setInParkingTime(parse);
      parkingRecord.setStatus(1);
      parkingRecord.setCreateTime(LocalDateTime.now());
      parkingRecord.setSerialnumber(order.getId());
@@ -121,7 +127,9 @@
      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.ofPattern("yyyy-MM-ddTHH:mm:ss.SSSZ"));
      parse.plusDays(8);
      parkingRecord.setOutParkingTime(parse);
      parkingRecord.setParkingDuration(Integer.valueOf(order.getLongTime()));
      parkingRecord.setOrderAmount(new BigDecimal(order.getMoney()));
      parkingRecord.setPayment(new BigDecimal(order.getMoney()));