java/mx_charging_pile.git

			@@ -692,7 +692,7 @@
			//提前结束定时任务
			scheduler.shutdown();
			}
			}, 5, 300, TimeUnit.SECONDS);
			}, 5000, 300, TimeUnit.MILLISECONDS);
			return AjaxResult.success();
			}

			@@ -1205,6 +1205,12 @@
			for (ChargingOrderVO chargingOrderVO : list) {
			TChargingGun data3 = chargingGunClient.getChargingGunById(chargingOrderVO.getChargingGunId()).getData();
			TChargingPile data2 = chargingPileClient.getChargingPileById(chargingOrderVO.getChargingPileId()).getData();
			if (chargingOrderVO.getSiteId()!=null){
			List<Integer> integers = new ArrayList<>();
			integers.add(chargingOrderVO.getSiteId());
			List<Site> data = siteClient.getSiteByIds(integers).getData();
			if (!data.isEmpty())chargingOrderVO.setSiteName(data.get(0).getName());
			}
			if (data2!=null && data3!=null){
			chargingOrderVO.setTerminalName(data2.getName()+"-"+data3.getName());

			@@ -1220,7 +1226,9 @@
			// 单个订单累计服务费
			BigDecimal serviceMoney1 = new BigDecimal("0");
			UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrderVO.getCode()).getData();
			chargingOrderVO.setChargingSecond(data5.getTime_remaining()*60L);
			if (data5!=null){
			chargingOrderVO.setChargingSecond(data5.getTime_remaining()*60L);
			}
			// 总收入
			if (chargingOrderVO.getRefundStatus() !=null && chargingOrderVO.getRefundStatus() == 2){
			income = income.add(chargingOrderVO.getPaymentAmount().subtract(chargingOrderVO.getRefundAmount()));