无关风月
2025-01-17 679775d2cdfab3fd34c31e640a5199726de821e5
bug修改
1个文件已修改
22 ■■■■■ 已修改文件
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1261,16 +1261,6 @@
         BigDecimal refundMoney = new BigDecimal("0");
         BigDecimal paymentMoney = new BigDecimal("0");
        List<String> collect2 = list.stream().map(TChargingOrder::getCode).collect(Collectors.toList());
        StringBuilder stringBuilder2 = new StringBuilder();
        List<UploadRealTimeMonitoringData> uploadRealTimeMonitoringData2 = new ArrayList<>();
        for (String s : collect2) {
            stringBuilder2.append(s).append(",");
        }
        if (stringBuilder2.length()>0){
            StringBuilder ids = stringBuilder2.deleteCharAt(stringBuilder2.length() - 1);
            uploadRealTimeMonitoringData2 = uploadRealTimeMonitoringDataClient.getOrderInfoByCodes(ids.toString()).getData();
        }
        for (ChargingOrderVO chargingOrderVO : list) {
            if (roleType == 2){
                for (Integer siteId : siteIds) {
@@ -1297,11 +1287,13 @@
            // 充电订单 明细记录
            List<TChargingOrderAccountingStrategy> chargingOrderId = chargingOrderAccountingStrategyService.list(new QueryWrapper<TChargingOrderAccountingStrategy>()
                    .eq("charging_order_id", chargingOrderVO.getId()));
            UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringData2.stream().filter(e -> e.getTransaction_serial_number().equals(chargingOrderVO.getCode()))
                    .findFirst().orElse(null);
            if (data5!=null && data5.getCumulative_charging_time()!=null){
                long l = data5.getCumulative_charging_time() * 60L;
                chargingOrderVO.setChargingSecond(l);
            if (chargingOrderVO.getStartTime()!=null && chargingOrderVO.getEndTime()!=null){
                LocalDateTime startTime = chargingOrderVO.getStartTime();
                LocalDateTime endTime = chargingOrderVO.getEndTime();
                // 计算时间差 单位秒
                long between = ChronoUnit.SECONDS.between(startTime, endTime);
                chargingOrderVO.setChargingSecond(between);
            }
            // 充电时段数
            int size = chargingOrderId.size();