合并代码

puzhibing

2024-10-16 65a32f5cd03572b5c3606172149de7a2b4a56f20

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

@@ -1863,13 +1863,16 @@
            if(StringUtils.hasLength(time)){
               //充电度数
               Object invoke = clazz.getMethod("getSharp_peak_charge" + (i + 1)).invoke(vo);
               if(null == invoke || invoke.toString().equals("0")){
                  continue;
               }
               BigDecimal Sharp_peak_charge = new BigDecimal(invoke.toString());
               //充电金额
               Object invoke1 = clazz.getMethod("getSharp_peak_amount" + (i + 1)).invoke(vo);
               BigDecimal sharp_peak_amount = new BigDecimal(invoke1.toString());
               
               String[] split = time.split("~");
               AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.stream().filter(s -> s.getStartTime().equals(split[1]) && s.getEndTime().equals(split[2])).findFirst().get();
               String[] split = time.split("-");
               AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.stream().filter(s -> s.getStartTime().equals(split[0]) && s.getEndTime().equals(split[1])).findFirst().get();
               
               TChargingOrderAccountingStrategy chargingOrderAccountingStrategy = new TChargingOrderAccountingStrategy();
               chargingOrderAccountingStrategy.setChargingOrderId(chargingOrder.getId());