From 7ccad6acbb203cae762790bab88b467b78305f2c Mon Sep 17 00:00:00 2001
From: yuyang <2265829957@qq.com>
Date: Wed, 18 Aug 2021 19:23:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A9=E5=90=AF=E5=8A=A8=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/api/HxpcPileOrderController.java    | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcPileOrderController.java
index 00ded0ad..164dcb0d 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcPileOrderController.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/HxpcPileOrderController.java
@@ -2,18 +2,14 @@ package com.xhpc.order.api;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.xhpc.common.api.PileOrderService;
 import com.xhpc.common.core.domain.R;
 import com.xhpc.common.core.web.controller.BaseController;
-import com.xhpc.common.core.web.domain.AjaxResult;
 import com.xhpc.common.data.redis.CacheOrderData;
 import com.xhpc.common.data.redis.CacheRealtimeData;
-import com.xhpc.common.dto.PileEndOrder;
 import com.xhpc.common.redis.service.RedisService;
 import com.xhpc.common.util.ConnectionRabbitMQUtil;
 import com.xhpc.order.domain.*;
@@ -22,8 +18,10 @@ import com.xhpc.order.service.IXhpcHistoryOrderService;
 import com.xhpc.order.service.IXhpcRealTimeOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -75,10 +73,9 @@ public class HxpcPileOrderController extends BaseController {
         //解析订单编号
         String s = orderNo.split("\\.")[0];
         String s1 = s.split(":")[1];
-        Long userId;
-        Integer code;
+        Long userId =0L;
+        Integer code =200;
         if (status == 1) {
-            code = 200;
             userId = update(0, 0, remark, s1, 0);
         } else {
             code = 500;
@@ -168,14 +165,14 @@ public class HxpcPileOrderController extends BaseController {
             if(cacheRealtimeData.getChargingTime()>60){
                 int mins = cacheRealtimeData.getChargingTime() % 60;
                 int hours = cacheRealtimeData.getChargingTime() / 60;
-                xhpcRealTimeOrder.setChargingTime(mins+"时"+hours+"分");
+                xhpcRealTimeOrder.setChargingTime(hours+"时"+mins+"分");
             }else{
                 xhpcRealTimeOrder.setChargingTime(cacheRealtimeData.getChargingTime()+"分");
             }
             if(cacheRealtimeData.getRemainingTime()>60){
                 int mins = cacheRealtimeData.getChargingTime() % 60;
                 int hours = cacheRealtimeData.getChargingTime() / 60;
-                xhpcRealTimeOrder.setRemainingTime(mins+"时"+hours+"分");
+                xhpcRealTimeOrder.setRemainingTime(hours+"时"+mins+"分");
             }else{
                 xhpcRealTimeOrder.setRemainingTime(cacheRealtimeData.getChargingTime()+"分");
             }
@@ -268,7 +265,14 @@ public class HxpcPileOrderController extends BaseController {
             //充电时长
             Long tiem = endTime.getTime()-startTime.getTime();
 
-            hxpcChargeOrder.setChargingTime(tiem+"");
+            if(tiem>60000){
+                long mins = tiem % 60000;
+                long hours = tiem / 60000;
+                hxpcChargeOrder.setChargingTime(hours+"时"+mins+"分");
+            }else{
+                long mins = tiem % 60000;
+                hxpcChargeOrder.setChargingTime(mins+"分");
+            }
             hxpcChargeOrder.setChargingDegree(cacheOrderData.getTotalPowerQuantity().toString());
             hxpcChargeOrder.setAmountCharged(money.toString());
             String stopReason = cacheOrderData.getStopReason();
@@ -480,4 +484,12 @@ public class HxpcPileOrderController extends BaseController {
         }
     }
 
+    public static void main(String[] args) {
+
+        long time = DateUtil.parse("2021-08-18 12:12:12").getTime();
+
+        long time1 = DateUtil.parse("2021-08-19 12:12:12").getTime();
+
+        System.out.println(time1-time);
+    }
 }