明星电力充电桩
parent: d0b83b31 | 补丁 | 提交 | show whitespace
无关风月
2025-02-12 ef60b381d2c9e7fad9f126538b03d1b9c59cd352 
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
1个文件已修改
3 ■■■■■ 已修改文件
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java


@@ -599,6 +599,7 @@


            if(null != data && data.getChargeNum() > 0){


                //计算折扣


                List<AccountingStrategyDetailOrder> list = accountingStrategyDetailOrderClient.getAllAccountingStrategyDetailOrder(chargingOrder.getId()).getData();


                list.get(list.size() - 1).setEndTime("23:59");


                //将数据叠加两份，处理跨天的情况


                list.addAll(list);


                boolean sta = false;


@@ -2192,7 +2193,7 @@


        UploadRealTimeMonitoringData uploadRealTimeMonitoringData = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();


        if(null != uploadRealTimeMonitoringData && null == chargingOrder.getEndMode()){


            Integer soc = uploadRealTimeMonitoringData.getSoc();


            if(soc > 98){


            if(soc >= 98){


                order.setEndMode(2);


            }else if(chargingOrder.getResidualAmount().compareTo(new BigDecimal(1)) <= 0){


                order.setEndMode(3);