ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -2019,10 +2019,10 @@ if(null == chargingOrder){ return R.ok(); } Integer status = chargingOrder.getStatus(); if(status == 5){ return R.ok(); } // Integer status = chargingOrder.getStatus(); // if(status == 5){ // return R.ok(); // } //如果使用优惠券需要判断优惠券是否满足使用条件 //根据实际的充电金额计算退款金额 退回费用=(原金额/总金额)*(总金额-实际充电金额) @@ -2085,7 +2085,7 @@ AccountingStrategyDetailOrderVo vo1 = new AccountingStrategyDetailOrderVo(); BeanUtils.copyProperties(strategyDetail, vo1); vo1.setChargingCapacity(sharp_peak_charge); lists.add(vo1); lists.add(0, vo1); } //第二天的