bug修改

无关风月

2025-01-22 e2da1921d7b6e5b466bccb5908f46d6c0d9a4b5a

bug修改

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -1540,13 +1540,12 @@
                    chargingOrderListVO.setTerminalName(data2.getName() + "-" + data1.getName());
                }
            }
            // 获取充电时间
            UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrderListVO.getCode()).getData();
            if (data5!=null){
                if (data5.getTime_remaining()!=null){
                    chargingOrderListVO.setChargingSecond(data5.getCumulative_charging_time()*60L);

                }
            if (chargingOrderListVO.getStartTime()!=null && chargingOrderListVO.getEndTime()!=null){
                LocalDateTime startTime = chargingOrderListVO.getStartTime();
                LocalDateTime endTime = chargingOrderListVO.getEndTime();
                // 计算时间差 单位秒
                long between = ChronoUnit.SECONDS.between(startTime, endTime);
                chargingOrderListVO.setChargingSecond(between);
            }
            // 获取开始SOC 结束soc
            if (chargingOrderListVO.getCode()!=null){
@@ -1636,6 +1635,13 @@
            Site site = sites.stream().filter(e -> e.getId().equals(chargingOrderListVO.getSiteId())).findFirst().orElse(null);
            if (site!=null){
                chargingOrderListVO.setSiteName(site.getName());
            }
            if (chargingOrderListVO.getStartTime()!=null && chargingOrderListVO.getEndTime()!=null){
                LocalDateTime startTime = chargingOrderListVO.getStartTime();
                LocalDateTime endTime = chargingOrderListVO.getEndTime();
                // 计算时间差 单位秒
                long between = ChronoUnit.SECONDS.between(startTime, endTime);
                chargingOrderListVO.setChargingSecond(between);
            }
            if (chargingOrderListVO.getChargingGunId()!=null && chargingOrderListVO.getChargingPileId()!=null){
                TChargingGun data1 = chargingGunClient.getChargingGunById(chargingOrderListVO.getChargingGunId()).getData();
@@ -1762,6 +1768,8 @@
    public ChargingOrderListInfoVO chargingInfo(String uid) {
        TChargingOrder chargingOrder= this.getById(uid);
        ChargingOrderListInfoVO chargingOrderListInfoVO = new ChargingOrderListInfoVO();
        chargingOrderListInfoVO.setStartTime(chargingOrder.getStartTime());
        chargingOrderListInfoVO.setEndTime(chargingOrder.getEndTime());
        chargingOrderListInfoVO.setStatus(chargingOrder.getStatus());
        BigDecimal bigDecimal = new BigDecimal("0.006");
        if (chargingOrder.getOrderAmount()!=null){
@@ -1838,13 +1846,12 @@

            chargingOrderListInfoVO.setList(data6);
        }
        // 获取充电时间
        UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
        if (data5!=null){
            if (data5.getTime_remaining()!=null){
                chargingOrderListInfoVO.setChargingSecond(data5.getCumulative_charging_time()*60L+"");

            }
        if (chargingOrderListInfoVO.getStartTime()!=null && chargingOrderListInfoVO.getEndTime()!=null){
            LocalDateTime startTime = chargingOrderListInfoVO.getStartTime();
            LocalDateTime endTime = chargingOrderListInfoVO.getEndTime();
            // 计算时间差 单位秒
            long between = ChronoUnit.SECONDS.between(startTime, endTime);
            chargingOrderListInfoVO.setChargingSecond(between+"");
        }

        if (chargingOrder.getAppUserCarId()!=null){