puzhibing
2024-08-27 49c5d881d50acac8dc2659f31b2206c36f83c862
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -462,7 +462,9 @@
       BigDecimal electronicMoney = new BigDecimal("0");
       BigDecimal serviceMoney = new BigDecimal("0");
      for (ChargingOrderVO chargingOrderVO : list) {
         if (chargingOrderVO.getChargingCapacity()!=null){
         total = total.add(chargingOrderVO.getChargingCapacity());
         }
         // 充电订单 明细记录
         List<TChargingOrderAccountingStrategy> chargingOrderId = chargingOrderAccountingStrategyService.list(new QueryWrapper<TChargingOrderAccountingStrategy>()
               .eq("charging_order_id", chargingOrderVO.getId()));
@@ -473,9 +475,11 @@
         LocalDateTime startTime = chargingOrderVO.getStartTime();
         LocalDateTime endTime = chargingOrderVO.getEndTime();
         // 计算时间差 秒 充电时长
         if (startTime!=null && endTime!=null){
         long between = ChronoUnit.SECONDS.between(startTime, endTime);
         chargingOrderVO.setChargingSecond(between);
         time += between;
         }
         // 总收入
         if (chargingOrderVO.getRefundStatus() == 2){
            income = income.add(chargingOrderVO.getPaymentAmount().subtract(chargingOrderVO.getRefundAmount()));