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