From c38605d690c3a2d23cbace2c605246f936d070e2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 26 十月 2024 11:49:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderChargingInfo.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderChargingInfo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderChargingInfo.java
index 0c6b0c9..32db2d9 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderChargingInfo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderChargingInfo.java
@@ -2,9 +2,10 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.order.api.model.TChargingOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
+import java.time.Duration;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -34,4 +35,20 @@
private BigDecimal orderAmount;
@ApiModelProperty(value = "车牌")
private String carNum;
+ private TChargingOrder tChargingOrder;
+ private Long periodCount;
+ private String timeCount;
+ public String calculateDuration() {
+ if (startTime == null || endTime == null) {
+ return "00:00:00";
+ }
+
+ Duration duration = Duration.between(startTime, endTime);
+ long totalSeconds = duration.getSeconds();
+ long hours = totalSeconds / 3600;
+ long minutes = (totalSeconds % 3600) / 60;
+ long seconds = totalSeconds % 60;
+
+ return String.format("%02d:%02d:%02d", hours, minutes, seconds);
+ }
}
--
Gitblit v1.7.1