From 43145f12ab71544d96e7212f24edf4e6dae4a8fc Mon Sep 17 00:00:00 2001 From: ZZ Date: Fri, 27 Aug 2021 16:47:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E9=AA=9A=E7=9A=84?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=90=83=E6=8E=89=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/api/XhpcPileOrderController.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java index 657409d9..ddf8ee76 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java @@ -228,17 +228,19 @@ public class XhpcPileOrderController extends BaseController { DateTime startTime = DateUtil.parse(cacheOrderData.getStartTime()); DateTime endTime = DateUtil.parse(cacheOrderData.getEndTime()); + xhpcChargeOrder.setStartTime(startTime); xhpcChargeOrder.setEndTime(endTime); - + System.out.println(endTime.getTime()); + System.out.println(startTime.getTime()); //充电时长 - Long tiem = (endTime.getTime() - startTime.getTime()) % 1000; - if (tiem > 60) { - long mins = tiem % 60; - long hours = tiem / 60; - xhpcChargeOrder.setChargingTime(hours + "时" + mins + "分"); + Long tiem = (endTime.getTime() - startTime.getTime()) / 1000; + if (tiem > 3600) { + long hours = tiem / 3600; + double mins = (double) ((tiem - (hours * 3600)) / 60); + xhpcChargeOrder.setChargingTime(hours + "时" + new BigDecimal(mins).setScale(0) + "分"); } else { - long mins = tiem % 60; - xhpcChargeOrder.setChargingTime(mins + "分"); + double mins = (double) (tiem / 60); + xhpcChargeOrder.setChargingTime(new BigDecimal(mins).setScale(0) + "分"); } xhpcChargeOrder.setChargingTimeNumber(tiem.intValue()); BigDecimal divide = new BigDecimal(cacheOrderData.getTotalPowerQuantity()).divide(bigDecimal);