| | |
|---|
| | | if(null != data){ |
|---|
| | | //支付失败，删除无效的订单 |
|---|
| | | String tradeStatus = data.getTradeStatus(); |
|---|
| | | if(tradeStatus.equals("TRADE_CLOSED")){ |
|---|
| | | if(null != tradeStatus && tradeStatus.equals("TRADE_CLOSED")){ |
|---|
| | | this.removeById(tChargingOrder.getId()); |
|---|
| | | } |
|---|
| | | } |
|---|
| | |
|---|
| | | 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; |
|---|
| | |
|---|
| | | endTime2 = split[1]; |
|---|
| | | } |
|---|
| | | PageInfo<ChargingOrderVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize()); |
|---|
| | | PageInfo<ChargingOrderVO> pageInfo1 = new PageInfo<>(1,9999999); |
|---|
| | | PageInfo<ChargingOrderVO> pageInfo1 = new PageInfo<>(1,999999999); |
|---|
| | | |
|---|
| | | if (StringUtils.hasLength(dto.getPhone())){ |
|---|
| | | List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData(); |
|---|
| | |
|---|
| | | 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(order.getResidualAmount().compareTo(new BigDecimal(1)) <= 0){ |
|---|
| | | }else if(chargingOrder.getResidualAmount().compareTo(new BigDecimal(1)) <= 0){ |
|---|
| | | order.setEndMode(3); |
|---|
| | | }else{ |
|---|
| | | order.setEndMode(0); |
|---|
