Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-31 e25b31c6abf9b26f2b61768ad6039961574b10a1

 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);
   }