Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-28 eb767fea1c9c55b66443758666cf6e987b706ff8

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

@@ -1864,10 +1864,10 @@
      } catch (ParseException e) {
         throw new RuntimeException(e);
      }
      System.err.println(start.getTime() + "\n" + end.getTime() + "\n" + lists.get(0).getStart() + "\n" + lists.get(0).getEnd());
		
		
      for (AccountingStrategyDetailOrderVo strategyDetail : lists) {
         if(strategyDetail.getStart() < start.getTime() || strategyDetail.getEnd() > end.getTime()){
            continue;
         }
         BigDecimal sharp_peak_charge = strategyDetail.getChargingCapacity();
         TChargingOrderAccountingStrategy chargingOrderAccountingStrategy = new TChargingOrderAccountingStrategy();
         chargingOrderAccountingStrategy.setChargingOrderId(chargingOrder.getId());
@@ -1883,9 +1883,9 @@
            chargingOrderAccountingStrategy.setStartTime(strategyDetail.getStartTime());
         }
         if(end.getTime() >= strategyDetail.getEnd()){
            chargingOrderAccountingStrategy.setStartTime(strategyDetail.getEndTime());
            chargingOrderAccountingStrategy.setEndTime(strategyDetail.getEndTime());
         }else{
            chargingOrderAccountingStrategy.setStartTime(sdf2.format(end));
            chargingOrderAccountingStrategy.setEndTime(sdf2.format(end));
         }
         
         //已充电总度数