明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
无关风月
2024-10-27 f2a57f2a9fa309f872d10c7fada992b63a0c0d5f 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java


@@ -217,7 +217,6 @@


                    if (data5.getTime_remaining()!=null){


                        chargingSecond+=data5.getTime_remaining()*60;


                    }


                }


                Integer cumulativeChargingTime = data5.getCumulative_charging_time();


                // 将其转化为xx小时xx分钟xx秒显示 如果是0小时则不展示小时 如果是0分钟则不展示分钟


                if (cumulativeChargingTime!=null){


@@ -238,6 +237,8 @@


                    tChargingOrder.setChargingTime(result.toString());


                }


                tChargingOrder.setEndSoc(data5.getSoc().toString());


                }




                TAppUser data3 = appUserClient.getUserById(tChargingOrder.getAppUserId()).getData();


                if (tChargingOrder.getAppUserCarId()!=null){


                    List<TAppUserCar> data4 = appUserCarClient.getCarByIds(Arrays.asList(tChargingOrder.getAppUserCarId())).getData();