| | |
|---|
| | | 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; |
|---|
| | |
|---|
| | | 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); |
|---|
