From ede9f7271d073944c17e1403391fcd8be53c7bae Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 19:34:08 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java | 4 ++++
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java | 5 +++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
index 39343ad..ee04672 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
@@ -36,6 +36,10 @@
@ApiModelProperty(value = "用户id")
@TableField("app_user_id")
private Long appUserId;
+
+ @ApiModelProperty(value = "订单标题")
+ @TableField("title")
+ private String title;
@ApiModelProperty(value = "停车场名称")
@TableField("name")
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 5b7ddeb..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
@@ -82,6 +82,7 @@
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);
}
@@ -134,6 +135,10 @@
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