From 1b81b84edaeea9b200c622e4a34c49b4b1aaac92 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 06 三月 2025 15:28:19 +0800
Subject: [PATCH] 修改bug和漏洞修复

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 1451 +++++++++++++++++++++++++++------------------------------
 1 files changed, 678 insertions(+), 773 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index e5b683f..9910897 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -32,6 +32,7 @@
 import com.ruoyi.integration.api.feignClient.*;
 import com.ruoyi.integration.api.model.*;
 import com.ruoyi.integration.api.vo.GetPlatformStopChargingReply;
+import com.ruoyi.integration.api.vo.StartChargeResult;
 import com.ruoyi.order.api.dto.SettlementConfirmAdd;
 import com.ruoyi.order.api.feignClient.AccountingStrategyDetailOrderClient;
 import com.ruoyi.order.api.feignClient.AccountingStrategyOrderClient;
@@ -66,6 +67,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -80,6 +82,7 @@
 import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.time.format.TextStyle;
+import java.time.temporal.ChronoUnit;
 import java.time.temporal.WeekFields;
 import java.util.*;
 import java.util.concurrent.*;
@@ -140,7 +143,7 @@
 	private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
 	
 	@Resource
-	private ChargingHandshakeClient chargingHandshakeClient;
+	private TCECClient tcecClient;
 
 	@Resource
 	private SendMessageClient sendMessageClient;
@@ -201,6 +204,12 @@
 	
 	//计数器
 	private Map<String, Integer> boot_failed_map = new HashMap<>();
+	
+	@Resource
+	private OperatorClient operatorClient;
+	
+	@Resource
+	private TransactionRecordClient transactionRecordClient;
 
 
 
@@ -271,6 +280,8 @@
 			}else{
 				myChargingOrderInfo.setLicensePlate("无");
 			}
+		}else{
+			myChargingOrderInfo.setLicensePlate(chargingOrder.getPlateNum());
 		}
 		myChargingOrderInfo.setStartTime(chargingOrder.getStartTime().atZone(ZoneId.systemDefault()).toInstant().getEpochSecond() * 1000);
 		myChargingOrderInfo.setEndTime(chargingOrder.getEndTime().atZone(ZoneId.systemDefault()).toInstant().getEpochSecond() * 1000);
@@ -395,7 +406,7 @@
 				if(null != data){
 					//支付失败，删除无效的订单
 					String tradeStatus = data.getTradeStatus();
-					if(tradeStatus.equals("TRADE_CLOSED")){
+					if(null != tradeStatus && tradeStatus.equals("TRADE_CLOSED")){
 						this.removeById(tChargingOrder.getId());
 					}
 				}
@@ -454,6 +465,12 @@
 		chargingOrder.setOrderClassification(1);
 		chargingOrder.setAppUserId(userId);
 		chargingOrder.setAppUserCarId(addChargingOrder.getAppUserCarId());
+		if(null != addChargingOrder.getAppUserCarId()){
+			TAppUserCar userCar = appUserCarClient.getCarById(addChargingOrder.getAppUserCarId().toString()).getData();
+			if(null != userCar){
+				chargingOrder.setPlateNum(userCar.getLicensePlate());
+			}
+		}
 		TChargingGun tChargingGun = chargingGunClient.getChargingGunById(addChargingOrder.getId()).getData();
 		TChargingPile chargingPile = chargingPileClient.getChargingPileById(tChargingGun.getChargingPileId()).getData();
 		chargingOrder.setSiteId(tChargingGun.getSiteId());
@@ -464,7 +481,7 @@
 		chargingOrder.setRechargeAmount(addChargingOrder.getPaymentAmount());
 		chargingOrder.setAppCouponId(addChargingOrder.getAppUserCouponId());
 		chargingOrder.setVipDiscountAmount(BigDecimal.ZERO);
-		chargingOrder.setOrderSource(0);
+		chargingOrder.setOrderSource(1);
 		chargingOrder.setTitle("【充电桩充电】" + chargingPile.getNumber() + "号桩/" + tChargingGun.getCode() + "号枪");
 		
 		Site site = siteClient.getSiteByIds(Arrays.asList(tChargingGun.getSiteId())).getData().get(0);
@@ -598,6 +615,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;
@@ -630,21 +648,19 @@
 						long times = rechargeAmount1.divide(s_total_amount, 0, RoundingMode.DOWN).longValue();
 						if(times > m){
 							//充电时间跨度两个计费策略，需要继续对下一个策略进行计算
-							serviceCharge = s_server_amount.multiply(new BigDecimal(m));
+							serviceCharge = serviceCharge.add(s_server_amount.multiply(new BigDecimal(m)));
 							rechargeAmount1 = rechargeAmount1.subtract(s_total_amount.multiply(new BigDecimal(m)));
-							if(null != discount){
-								discountAmount = discountAmount.add(serviceCharge.multiply(new BigDecimal(1).subtract(discount)));
-							}
 							nowTimeMillis = null;
 						}else{
-							serviceCharge = s_server_amount.multiply(new BigDecimal(times));
-							if(null != discount){
-								discountAmount = discountAmount.add(serviceCharge.multiply(new BigDecimal(1).subtract(discount)));
-							}
+							serviceCharge = serviceCharge.add(s_server_amount.multiply(new BigDecimal(times)));
 							break;
 						}
 					}
 				}
+				if(null != discount){
+					discountAmount = serviceCharge.multiply(new BigDecimal(1).subtract(discount));
+				}
+				
 				if(discountAmount.compareTo(BigDecimal.ZERO) >= 0){
 					//计算会员最大优惠金额
 					TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
@@ -655,9 +671,12 @@
 					}
 				}
 				discountAmount = discountAmount.setScale(4, RoundingMode.HALF_EVEN);
+				if(discountAmount.compareTo(BigDecimal.ZERO) >= 0){
+					data.setChargeNum(data.getChargeNum() - 1);
+					appUserVipDetailClient.updateAppUserVipDetail(data);
+				}
 			}
 		}
-		
 		
 		//机子上显示的金额为用户充值的金额+会员折扣金额
 		BigDecimal account_balance = chargingOrder.getRechargeAmount().add(discountAmount).setScale(4, RoundingMode.HALF_EVEN);
@@ -743,6 +762,10 @@
 			}
 			this.updateById(order);
 			redisService.setCacheObject(key, preChargeCheck1, 24L, TimeUnit.HOURS);
+			//推送三方平台订单状态
+			if(2 == chargingOrder.getOrderSource()){
+				tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
+			}
 			return true;
 		}else{
 			Integer counter = boot_failed_map.get(code);
@@ -773,6 +796,10 @@
 			order.setEndMode(0);
 			this.updateById(order);
 			redisService.setCacheObject(key, preChargeCheck1, 24L, TimeUnit.HOURS);
+			//推送三方平台订单状态
+			if(2 == chargingOrder.getOrderSource()){
+				tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
+			}
 			return true;
 		}
 	}
@@ -832,9 +859,24 @@
 			TChargingGun chargingGun = chargingGunClient.getChargingGunById(order.getChargingGunId()).getData();
 			chargingGun.setStatus(4);
 			chargingGunClient.updateChargingGunById(chargingGun);
+			//推送状态给三方平台
+			tcecClient.pushChargingGunStatus(chargingGun.getFullNumber(), chargingGun.getStatus());
 		}
 		redisService.setCacheObject("AQJC_" + order.getChargingGunId(), preChargeCheck1, 24L, TimeUnit.HOURS);
 		this.updateById(order);
+		//推送三方平台启动充电结果
+		if(2 == order.getOrderSource()){
+			StartChargeResult result = new StartChargeResult();
+			result.setStartChargeSeq(order.getStartChargeSeq());
+			result.setStartChargeSeqStat(3 == order.getStatus() ? 2 : 4);
+			result.setConnectorID(order.getChargingGunId().toString());
+			result.setStartTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+			Operator operator = operatorClient.getOperatorById(order.getOperatorId()).getData();
+			result.setOperatorID(operator.getOperatorId());
+			tcecClient.notificationStartChargeResult(result);
+			
+			tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
+		}
 	}
 	
 	/**
@@ -844,7 +886,7 @@
 	public void refund(String code){
 		log.info(code + "：-------------------充电启动失败，执行退款-------------------");
 		TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, code));
-		if(chargingOrder.getStatus() == 2){
+		if(chargingOrder.getOrderSource() == 1 && chargingOrder.getStatus() == 2){
 			Integer rechargePaymentType = chargingOrder.getRechargePaymentType();
 			BigDecimal rechargeAmount = chargingOrder.getRechargeAmount();
 			//构建退款明细
@@ -874,9 +916,27 @@
 				amount.setTotal(rechargeAmount.multiply(new BigDecimal(100)).intValue());
 				amount.setCurrency("CNY");
 				model.setAmount(amount);
-				R<String> orderR = wxPaymentClient.refundOrderR(model);
+				R<Map<String, Object>> orderR = wxPaymentClient.refundOrderR(model);
 				if(200 == orderR.getCode()){
 					chargingOrderRefundService.save(chargingOrderRefund);
+					//手续费
+					Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
+					Object refund_fee1 = amount1.get("refund_fee");
+					BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));
+					chargingOrderRefund.setRefundFee(refund_fee);
+					chargingOrderRefundService.updateById(chargingOrderRefund);
+					//回退会员折扣次数
+					if(chargingOrder.getVipDiscountAmount().compareTo(BigDecimal.ZERO) > 0){
+						TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
+						GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
+						getAppUserVipDetail.setAppUserId(chargingOrder.getAppUserId());
+						getAppUserVipDetail.setVipId(appUser.getVipId());
+						TAppUserVipDetail data = appUserVipDetailClient.getAppUserVipDetail(getAppUserVipDetail).getData();
+						if(null != data){
+							data.setChargeNum(data.getChargeNum() + 1);
+							appUserVipDetailClient.updateAppUserVipDetail(data);
+						}
+					}
 				}
 			}
 			if(2 == rechargePaymentType){
@@ -887,10 +947,26 @@
 				dto.setRefundReason("充电失败，取消充电订单");
 				RefundResp resp = aliPaymentClient.refund(dto).getData();
 				if(null != resp){
-					AjaxResult success = chargingOrderStartupFailureWxRefund(resp.getOutTradeNo(), resp.getTradeNo(), "SUCCESS", null);
-					if(success.isSuccess()){
-						chargingOrderRefundService.save(chargingOrderRefund);
+					chargingOrderRefundService.save(chargingOrderRefund);
+					//回退会员折扣次数
+					if(chargingOrder.getVipDiscountAmount().compareTo(BigDecimal.ZERO) > 0){
+						TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
+						GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
+						getAppUserVipDetail.setAppUserId(chargingOrder.getAppUserId());
+						getAppUserVipDetail.setVipId(appUser.getVipId());
+						TAppUserVipDetail data = appUserVipDetailClient.getAppUserVipDetail(getAppUserVipDetail).getData();
+						if(null != data){
+							data.setChargeNum(data.getChargeNum() + 1);
+							appUserVipDetailClient.updateAppUserVipDetail(data);
+						}
 					}
+					
+					try {
+						Thread.sleep(1000);
+					} catch (InterruptedException e) {
+						throw new RuntimeException(e);
+					}
+					chargingOrderStartupFailureWxRefund(chargingOrderRefund.getRefundCode(), resp.getTradeNo(), "SUCCESS", null);
 				}
 			}
 
@@ -999,7 +1075,6 @@
 		chargingOrder.setStatus(4);
 		chargingOrder.setEndMode(1);
 		this.updateById(chargingOrder);
-		
 		String code1 = order.getCode();
 		TChargingGun chargingGun = chargingGunClient.getChargingGunById(order.getChargingGunId()).getData();
 		//异步线程处理停机
@@ -1014,6 +1089,11 @@
 			log.info(code1 + "：-------------------远程停止充电请求-------------------");
 			log.info(platformStopCharging.toString());
 		});
+		//推送三方平台
+		if(2 == order.getOrderSource()){
+			tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
+		}
+		
 		return AjaxResult.success();
 	}
 	
@@ -1096,7 +1176,7 @@
 				if(1 == doubleIntegration){
 					num1 *= 2;
 				}
-				
+
 			}
 			
 			GetInviteUser query = new GetInviteUser();
@@ -1186,8 +1266,11 @@
     @Override
     public TCharingOrderVO chargingOrder(ChargingOrderQuery dto) {
 		TCharingOrderVO tCharingOrderVO = new TCharingOrderVO();
-
-
+		List<TChargingGun> allGun = chargingGunClient.getAllGun().getData();
+		List<TChargingPile> allPile = chargingGunClient.getAllPile().getData();
+		List<Site> data9 = siteClient.getSiteAll().getData();
+		List<TAppUser> data6 = appUserClient.getAllUser().getData();
+		List<TAppUserCar> data4 = appUserCarClient.getAllCar().getData();
 		String startTime1 = null;
 		String startTime2 = null;
 		String endTime1 = null;
@@ -1204,7 +1287,7 @@
 			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();
@@ -1253,23 +1336,13 @@
 		List<ChargingOrderVO> list1 = this.baseMapper.chargingOrder(pageInfo1,dto,startTime1,startTime2,endTime1,endTime2);
 		 BigDecimal total = new BigDecimal("0");
 		 long time = 0L;
-		 BigDecimal income = new BigDecimal("0");
 		 BigDecimal electronicMoney = new BigDecimal("0");
 		 BigDecimal serviceMoney = new BigDecimal("0");
 		 BigDecimal commissionMoney = new BigDecimal("0");
 		 BigDecimal refundMoney = new BigDecimal("0");
 		 BigDecimal paymentMoney = new BigDecimal("0");
-		List<String> collect2 = list.stream().map(TChargingOrder::getCode).collect(Collectors.toList());
-		StringBuilder stringBuilder2 = new StringBuilder();
-		List<UploadRealTimeMonitoringData> uploadRealTimeMonitoringData2 = new ArrayList<>();
-		for (String s : collect2) {
-			stringBuilder2.append(s).append(",");
-		}
-		if (stringBuilder2.length()>0){
-			StringBuilder ids = stringBuilder2.deleteCharAt(stringBuilder2.length() - 1);
-			uploadRealTimeMonitoringData2 = uploadRealTimeMonitoringDataClient.getOrderInfoByCodes(ids.toString()).getData();
+		List<TChargingOrderAccountingStrategy> list3 = chargingOrderAccountingStrategyService.list();
 
-		}
 		for (ChargingOrderVO chargingOrderVO : list) {
 			if (roleType == 2){
 				for (Integer siteId : siteIds) {
@@ -1277,88 +1350,94 @@
 					List<Boolean> t1= partnerClient.getChargingOrderMenu(sysUser.getObjectId(),siteId).getData();
 					chargingOrderVO.setAuthRecord(t1.get(0));
 				}
-
 			}
-			chargingOrderVO.setCommissionAmount(chargingOrderVO.getOrderAmount()!=null?chargingOrderVO.getOrderAmount().multiply(new BigDecimal("0.006")):new BigDecimal("0"));
-			chargingOrderVO.setPlatFormMoney(chargingOrderVO.getOrderAmount()!=null?chargingOrderVO.getOrderAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
+			chargingOrderVO.setSharingAmount(chargingOrderVO.getServiceCharge()!=null?chargingOrderVO.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
+			chargingOrderVO.setCommissionAmount(chargingOrderVO.getRechargeAmount()!=null?chargingOrderVO.getRechargeAmount().multiply(new BigDecimal("0.006")):new BigDecimal("0"));
+			chargingOrderVO.setPlatFormMoney(chargingOrderVO.getRechargeAmount()!=null?chargingOrderVO.getRechargeAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
 			chargingOrderVO.setUid(chargingOrderVO.getId()+"");
-			TChargingGun data3 = chargingGunClient.getChargingGunById(chargingOrderVO.getChargingGunId()).getData();
-			TChargingPile data2 = chargingPileClient.getChargingPileById(chargingOrderVO.getChargingPileId()).getData();
+			TChargingGun data3 = allGun.stream().filter(e->e.getId().equals(chargingOrderVO.getChargingGunId())).findFirst().orElse(null);
+			TChargingPile data2 = allPile.stream().filter(e->e.getId().equals(chargingOrderVO.getChargingPileId())).findFirst().orElse(null);
 			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());
+				Site site = data9.stream().filter(e -> e.getId().equals(chargingOrderVO.getSiteId())).findFirst().orElse(null);
+				if (site!=null)chargingOrderVO.setSiteName(site.getName());
 			}
 			if (data2!=null && data3!=null){
 				chargingOrderVO.setTerminalName(data2.getName()+"-"+data3.getName());
 			}
 			// 充电订单 明细记录
-			List<TChargingOrderAccountingStrategy> chargingOrderId = chargingOrderAccountingStrategyService.list(new QueryWrapper<TChargingOrderAccountingStrategy>()
-					.eq("charging_order_id", chargingOrderVO.getId()));
-			UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringData2.stream().filter(e -> e.getTransaction_serial_number().equals(chargingOrderVO.getCode()))
-					.findFirst().orElse(null);
-			if (data5!=null && data5.getCumulative_charging_time()!=null){
-				long l = data5.getCumulative_charging_time() * 60L;
-				chargingOrderVO.setChargingSecond(l);
+			List<TChargingOrderAccountingStrategy> chargingOrderId = list3.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderVO.getId())).collect(Collectors.toList());
+			if (chargingOrderVO.getStartTime()!=null && chargingOrderVO.getEndTime()!=null){
+				LocalDateTime startTime = chargingOrderVO.getStartTime();
+				LocalDateTime endTime = chargingOrderVO.getEndTime();
+				// 计算时间差 单位秒
+				long between = ChronoUnit.SECONDS.between(startTime, endTime);
+				chargingOrderVO.setChargingSecond(between);
+
 			}
 			// 充电时段数
 			int size = chargingOrderId.size();
 			chargingOrderVO.setCount(size);
 			// 用户手机号
-			TAppUser data = appUserClient.getUserById(chargingOrderVO.getAppUserId()).getData();
+			TAppUser data = data6.stream().filter(e -> e.getId().equals(chargingOrderVO.getAppUserId())).findFirst().orElse(null);
 			if (data!=null){
 				// 车牌号
 				chargingOrderVO.setPhone(data.getPhone());
 				List<Long> longs = new ArrayList<>();
 				if (chargingOrderVO.getAppUserCarId()!=null){
 					longs.add(chargingOrderVO.getAppUserCarId());
-					List<TAppUserCar> data1 = appUserCarClient.getCarByIds(longs).getData();
-					if (!data1.isEmpty()){
-						chargingOrderVO.setLicensePlate(data1.get(0).getLicensePlate());
+					TAppUserCar tAppUserCar = data4.stream().filter(e -> e.getId().equals(chargingOrderVO.getAppUserCarId())).findFirst().orElse(null);
+					if (tAppUserCar!=null){
+						chargingOrderVO.setLicensePlate(tAppUserCar.getLicensePlate());
 					}
+				}else{
+					chargingOrderVO.setLicensePlate(chargingOrderVO.getPlateNum());
 				}
 
 			}
 		}
-		List<String> collect = list1.stream().map(TChargingOrder::getCode).collect(Collectors.toList());
-		StringBuilder stringBuilder = new StringBuilder();
-		List<UploadRealTimeMonitoringData> uploadRealTimeMonitoringData = new ArrayList<>();
-		for (String s : collect) {
-			stringBuilder.append(s).append(",");
-		}
-		if (stringBuilder.length()>0){
-			StringBuilder ids = stringBuilder.deleteCharAt(stringBuilder.length() - 1);
-			uploadRealTimeMonitoringData = uploadRealTimeMonitoringDataClient.getOrderInfoByCodes(ids.toString()).getData();
 
-		}
+
+		List<TChargingOrderRefund> chargingOrderRefunds = chargingOrderRefundService.lambdaQuery()
+				.eq(TChargingOrderRefund::getRefundStatus,2).list();
 
 		for (ChargingOrderVO chargingOrderVO : list1) {
-			paymentMoney= paymentMoney.add(chargingOrderVO.getPaymentAmount()!=null?chargingOrderVO.getPaymentAmount():new BigDecimal("0"));
-			commissionMoney = commissionMoney.add(chargingOrderVO.getOrderAmount()!=null?chargingOrderVO.getOrderAmount().multiply(new BigDecimal("0.006")):new BigDecimal("0"));
+			if (!chargingOrderVO.getOrderSource().equals(2)) {
+				paymentMoney = paymentMoney.add(chargingOrderVO.getPaymentAmount() != null ? chargingOrderVO.getPaymentAmount() : new BigDecimal("0"));
+			}else{
+				paymentMoney = paymentMoney.add(chargingOrderVO.getServiceCharge() != null ? chargingOrderVO.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN) : new BigDecimal("0"));
+
+			}
+			if (chargingOrderVO.getRechargeAmount()!=null){
+				commissionMoney = commissionMoney.add(chargingOrderVO.getRechargeAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN));
+			}
 			if (chargingOrderVO.getChargingCapacity()!=null){
 				total = total.add(chargingOrderVO.getElectricity()!=null?chargingOrderVO.getElectricity():new BigDecimal("0"));
 			}
-			UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringData.stream().filter(e -> e.getTransaction_serial_number().equals(chargingOrderVO.getCode()))
-					.findFirst().orElse(null);
-			if (data5!=null && data5.getCumulative_charging_time()!=null){
-				long l = data5.getCumulative_charging_time() * 60L;
-				chargingOrderVO.setChargingSecond(l);
-				time+=l;
+			if (chargingOrderVO.getStartTime()!=null && chargingOrderVO.getEndTime()!=null){
+				LocalDateTime startTime = chargingOrderVO.getStartTime();
+				LocalDateTime endTime = chargingOrderVO.getEndTime();
+				// 计算时间差 单位秒
+				long between = ChronoUnit.SECONDS.between(startTime, endTime);
+				time+=between;
 			}
-			List<TChargingOrderRefund> list2 = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getRefundStatus, 2)
-					.eq(TChargingOrderRefund::getChargingOrderId, chargingOrderVO.getId()).list();
+			List<TChargingOrderRefund> list2 = chargingOrderRefunds.stream().filter(e -> e.getChargingOrderId() != null && e.getChargingOrderId().equals(chargingOrderVO.getId()))
+					.collect(Collectors.toList());
 			for (TChargingOrderRefund tChargingOrderRefund : list2) {
-				if (tChargingOrderRefund.getRefundStatus()==2){
 					refundMoney = refundMoney.add(tChargingOrderRefund.getRefundTotalAmount());
-				}
 			}
 			electronicMoney = electronicMoney.add(chargingOrderVO.getElectrovalence()!=null?chargingOrderVO.getElectrovalence():new BigDecimal("0"));
-			serviceMoney = serviceMoney.add(chargingOrderVO.getServiceCharge()!=null?chargingOrderVO.getServiceCharge():new BigDecimal("0"));
+			if (!chargingOrderVO.getOrderSource().equals(2)){
+				serviceMoney = serviceMoney.add(chargingOrderVO.getServiceCharge()!=null?chargingOrderVO.getServiceCharge():new BigDecimal("0"));
+			}else{
+				serviceMoney = serviceMoney.add(chargingOrderVO.getServiceCharge()!=null?chargingOrderVO.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
+			}
 		}
 		tCharingOrderVO.setTotal(total);
 		tCharingOrderVO.setTime(time);
-		tCharingOrderVO.setIncome(paymentMoney.subtract(commissionMoney));
+//		tCharingOrderVO.setIncome(paymentMoney.subtract(commissionMoney));
+		tCharingOrderVO.setIncome(paymentMoney);
 		tCharingOrderVO.setElectronicMoney(electronicMoney);
 		tCharingOrderVO.setServiceMoney(serviceMoney);
 		pageInfo.setRecords(list);
@@ -1441,12 +1520,17 @@
 
 	@Resource
 	private SysUserClient sysUserClient;
+
+
 	@Override
 	public ChargingOrderTimeVO chargingList(ChargingListQuery dto) {
 		String startTime1 = null;
 		String startTime2 = null;
 		String endTime1 = null;
 		String endTime2 = null;
+
+		List<TChargingGun> allGun = chargingGunClient.getAllGun().getData();
+		List<TChargingPile> allPile = chargingGunClient.getAllPile().getData();
 
 		if (StringUtils.hasLength(dto.getStartTime())){
 			String[] split = dto.getStartTime().split(" - ");
@@ -1533,7 +1617,7 @@
 			chargingOrderListVO.setChargingCapacity(chargingOrderListVO.getElectricity());
 			BigDecimal bigDecimal = new BigDecimal("0.006");
 			if (chargingOrderListVO.getOrderAmount()!=null){
-				chargingOrderListVO.setCommissionAmount(chargingOrderListVO.getPaymentAmount().multiply(bigDecimal));
+				chargingOrderListVO.setCommissionAmount(chargingOrderListVO.getRechargeAmount().multiply(bigDecimal));
 			}
 			chargingOrderListVO.setPaymentAmount(chargingOrderListVO.getPaymentAmount());
 			chargingOrderListVO.setUid(chargingOrderListVO.getId()+"");
@@ -1544,19 +1628,18 @@
 				chargingOrderListVO.setSiteName(site.getName());
 			}
 			if (chargingOrderListVO.getChargingGunId()!=null && chargingOrderListVO.getChargingPileId()!=null){
-				TChargingGun data1 = chargingGunClient.getChargingGunById(chargingOrderListVO.getChargingGunId()).getData();
-				TChargingPile data2 = chargingPileClient.getChargingPileById(chargingOrderListVO.getChargingPileId()).getData();
+				TChargingGun data1 = allGun.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingGunId())).findFirst().orElse(null);
+				TChargingPile data2 = allPile.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingPileId())).findFirst().orElse(null);
 				if (data2 != null && data1 != null) {
 					chargingOrderListVO.setTerminalName(data2.getName() + "-" + data1.getName());
 				}
 			}
-			// 获取充电时间
-			UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrderListVO.getCode()).getData();
-			if (data5!=null){
-				if (data5.getTime_remaining()!=null){
-					chargingOrderListVO.setChargingSecond(data5.getCumulative_charging_time()*60L);
-
-				}
+			if (chargingOrderListVO.getStartTime()!=null && chargingOrderListVO.getEndTime()!=null){
+				LocalDateTime startTime = chargingOrderListVO.getStartTime();
+				LocalDateTime endTime = chargingOrderListVO.getEndTime();
+				// 计算时间差 单位秒
+				long between = ChronoUnit.SECONDS.between(startTime, endTime);
+				chargingOrderListVO.setChargingSecond(between);
 			}
 			// 获取开始SOC 结束soc
 			if (chargingOrderListVO.getCode()!=null){
@@ -1590,6 +1673,8 @@
 								chargingOrderListVO.setLicensePlate(data4.get(0).getLicensePlate());
 							}
 						}
+					}else{
+						chargingOrderListVO.setLicensePlate(chargingOrderListVO.getPlateNum());
 					}
 					chargingOrderListVO.setPhone(data3.getPhone());
 				}
@@ -1635,11 +1720,39 @@
 						"0"+"%(平)/"+
 						"0"+"%(谷)");
 			}
-
+			if (chargingOrderListVO.getOrderSource().equals(2)){
+				chargingOrderListVO.setSharingAmount(chargingOrderListVO.getServiceCharge()!=null?
+						chargingOrderListVO.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_HALF_UP)
+						:new BigDecimal("0"));
+			}else{
+				chargingOrderListVO.setSharingAmount(new BigDecimal("0"));
+			}
 		}
 		// 不分页
 		PageInfo<ChargingOrderListVO> pageInfo1 = new PageInfo<>(1,999999999);
 		List<ChargingOrderListVO> list1 = this.baseMapper.chargingList(pageInfo1,dto,startTime1,startTime2,endTime1,endTime2);
+		for (ChargingOrderListVO chargingOrderListVO : list1) {
+			List<Integer> integers = new ArrayList<>();
+			integers.add(chargingOrderListVO.getSiteId());
+			Site site = sites.stream().filter(e -> e.getId().equals(chargingOrderListVO.getSiteId())).findFirst().orElse(null);
+			if (site!=null){
+				chargingOrderListVO.setSiteName(site.getName());
+			}
+			if (chargingOrderListVO.getStartTime()!=null && chargingOrderListVO.getEndTime()!=null){
+				LocalDateTime startTime = chargingOrderListVO.getStartTime();
+				LocalDateTime endTime = chargingOrderListVO.getEndTime();
+				// 计算时间差 单位秒
+				long between = ChronoUnit.SECONDS.between(startTime, endTime);
+				chargingOrderListVO.setChargingSecond(between);
+			}
+			if (chargingOrderListVO.getChargingGunId()!=null && chargingOrderListVO.getChargingPileId()!=null){
+				TChargingGun data1 = allGun.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingGunId())).findFirst().orElse(null);
+				TChargingPile data2 = allPile.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingPileId())).findFirst().orElse(null);
+				if (data2 != null && data1 != null) {
+					chargingOrderListVO.setTerminalName(data2.getName() + "-" + data1.getName());
+				}
+			}
+		}
 		chargingOrderTimeVO.setExportList(list1);
 		chargingOrderTimeVO.setOrderCount(list1.size());
 		// 计算充电总度数
@@ -1665,39 +1778,78 @@
 		BigDecimal feng = new BigDecimal("0");
 		BigDecimal ping = new BigDecimal("0");
 		BigDecimal gu = new BigDecimal("0");
-		List<Long> collect = list1.stream().map(ChargingOrderListVO::getId).collect(Collectors.toList());
-		List<TChargingOrderAccountingStrategy> chargingOrderAccountingStrategies = chargingOrderAccountingStrategyService.lambdaQuery()
-				.in(TChargingOrderAccountingStrategy::getChargingOrderId,collect).list();
+		List<TChargingOrderAccountingStrategy> chargingOrderAccountingStrategies = chargingOrderAccountingStrategyService.list();
 		for (ChargingOrderListVO chargingOrderListVO : list1) {
 			if (chargingOrderListVO.getChargingCapacity()!=null)electronic = electronic.add(chargingOrderListVO.getElectricity());
 
-			if (chargingOrderListVO.getPaymentAmount()!=null)paymentAmount = paymentAmount.add(chargingOrderListVO.getPaymentAmount());
+			if (chargingOrderListVO.getPaymentAmount()!=null){
+				if (chargingOrderListVO.getOrderSource().equals(2)){
+					paymentAmount = paymentAmount.add(chargingOrderListVO.getServiceCharge()!=null?chargingOrderListVO.getServiceCharge().multiply(new BigDecimal("0.2").setScale(2,BigDecimal.ROUND_HALF_UP)):new BigDecimal("0"));
+				}else{
+					paymentAmount = paymentAmount.add(chargingOrderListVO.getPaymentAmount());
+				}
+			}
 			if (chargingOrderListVO.getElectrovalence()!=null)electrovalence = electrovalence.add(chargingOrderListVO.getElectrovalence());
-			if (chargingOrderListVO.getServiceCharge()!=null)serviceCharge = serviceCharge.add(chargingOrderListVO.getServiceCharge());
-			List<TChargingOrderAccountingStrategy> list2 = chargingOrderAccountingStrategies.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderListVO.getId()))
-					.collect(Collectors.toList());
-			for (TChargingOrderAccountingStrategy temp : list2) {
-				switch (temp.getType()){
-					case 1:
-						if (temp.getChargingCapacity()!=null)jian = jian.add(temp.getChargingCapacity());
-						if (temp.getChargingCapacity()!=null)jianElectronic = jianElectronic.add(temp.getElectrovalence());
-						if (temp.getChargingCapacity()!=null)jianService = jianService.add(temp.getServiceCharge());
-						break;
-					case 2:
-						if (temp.getChargingCapacity()!=null)feng = feng.add(temp.getChargingCapacity());
-						if (temp.getChargingCapacity()!=null)fengElectronic = fengElectronic.add(temp.getElectrovalence());
-						if (temp.getChargingCapacity()!=null)fengService = fengService.add(temp.getServiceCharge());
-						break;
-					case 3:
-						if (temp.getChargingCapacity()!=null)ping = ping.add(temp.getChargingCapacity());
-						if (temp.getChargingCapacity()!=null)pingElectronic = pingElectronic.add(temp.getElectrovalence());
-						if (temp.getChargingCapacity()!=null)pingService = pingService.add(temp.getServiceCharge());
-						break;
-					case 4:
-						if (temp.getChargingCapacity()!=null)gu = gu.add(temp.getChargingCapacity());
-						if (temp.getChargingCapacity()!=null)guElectronic = guElectronic.add(temp.getElectrovalence());
-						if (temp.getChargingCapacity()!=null)guService = guService.add(temp.getServiceCharge());
-						break;
+			if (chargingOrderListVO.getServiceCharge()!=null){
+				if (chargingOrderListVO.getOrderSource().equals(2)){
+					serviceCharge = serviceCharge.add(chargingOrderListVO.getServiceCharge().multiply(new BigDecimal("0.2").setScale(2,BigDecimal.ROUND_HALF_UP)));
+				}else{
+					serviceCharge = serviceCharge.add(chargingOrderListVO.getServiceCharge());
+				}
+			}
+			if (!chargingOrderListVO.getOrderSource().equals(2)){
+				List<TChargingOrderAccountingStrategy> list2 = chargingOrderAccountingStrategies.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderListVO.getId()))
+						.collect(Collectors.toList());
+				for (TChargingOrderAccountingStrategy temp : list2) {
+					switch (temp.getType()){
+						case 1:
+							if (temp.getChargingCapacity()!=null)jian = jian.add(temp.getChargingCapacity());
+							if (temp.getElectrovalence()!=null)jianElectronic = jianElectronic.add(temp.getElectrovalence());
+							if (temp.getServiceCharge()!=null)jianService = jianService.add(temp.getServiceCharge());
+							break;
+						case 2:
+							if (temp.getChargingCapacity()!=null)feng = feng.add(temp.getChargingCapacity());
+							if (temp.getElectrovalence()!=null)fengElectronic = fengElectronic.add(temp.getElectrovalence());
+							if (temp.getServiceCharge()!=null)fengService = fengService.add(temp.getServiceCharge());
+							break;
+						case 3:
+							if (temp.getChargingCapacity()!=null)ping = ping.add(temp.getChargingCapacity());
+							if (temp.getElectrovalence()!=null)pingElectronic = pingElectronic.add(temp.getElectrovalence());
+							if (temp.getServiceCharge()!=null)pingService = pingService.add(temp.getServiceCharge());
+							break;
+						case 4:
+							if (temp.getChargingCapacity()!=null)gu = gu.add(temp.getChargingCapacity());
+							if (temp.getElectrovalence()!=null)guElectronic = guElectronic.add(temp.getElectrovalence());
+							if (temp.getServiceCharge()!=null)guService = guService.add(temp.getServiceCharge());
+							break;
+					}
+				}
+			}else{
+				List<TChargingOrderAccountingStrategy> list2 = chargingOrderAccountingStrategies.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderListVO.getId()))
+						.collect(Collectors.toList());
+				for (TChargingOrderAccountingStrategy temp : list2) {
+					switch (temp.getType()){
+						case 1:
+							if (temp.getChargingCapacity()!=null)jian = jian.add(temp.getChargingCapacity());
+							if (temp.getElectrovalence()!=null)jianElectronic = jianElectronic.add(temp.getElectrovalence());
+							if (temp.getServiceCharge()!=null)jianService = jianService.add(temp.getServiceCharge().multiply(new BigDecimal("0.2").setScale(2,BigDecimal.ROUND_HALF_UP)));
+							break;
+						case 2:
+							if (temp.getChargingCapacity()!=null)feng = feng.add(temp.getChargingCapacity());
+							if (temp.getElectrovalence()!=null)fengElectronic = fengElectronic.add(temp.getElectrovalence());
+							if (temp.getServiceCharge()!=null)fengService = fengService.add(temp.getServiceCharge().multiply(new BigDecimal("0.2").setScale(2,BigDecimal.ROUND_HALF_UP)));
+							break;
+						case 3:
+							if (temp.getChargingCapacity()!=null)ping = ping.add(temp.getChargingCapacity());
+							if (temp.getElectrovalence()!=null)pingElectronic = pingElectronic.add(temp.getElectrovalence());
+							if (temp.getServiceCharge()!=null)pingService = pingService.add(temp.getServiceCharge().multiply(new BigDecimal("0.2").setScale(2,BigDecimal.ROUND_HALF_UP)));
+							break;
+						case 4:
+							if (temp.getChargingCapacity()!=null)gu = gu.add(temp.getChargingCapacity());
+							if (temp.getElectrovalence()!=null)guElectronic = guElectronic.add(temp.getElectrovalence());
+							if (temp.getServiceCharge()!=null)guService = guService.add(temp.getServiceCharge().multiply(new BigDecimal("0.2").setScale(2,BigDecimal.ROUND_HALF_UP)));
+							break;
+					}
 				}
 			}
 		}
@@ -1706,28 +1858,29 @@
 		chargingOrderTimeVO.setPaymentAmount(paymentAmount);
 		chargingOrderTimeVO.setElectrovalence(electrovalence);
 		chargingOrderTimeVO.setServiceCharge(serviceCharge);
-		// 计算尖峰平谷充电量占比
+		// 计算尖峰平谷充电到账占比
+
 		BigDecimal add = jianElectronic.add(fengElectronic).add(pingElectronic).add(guElectronic);
 		// 计算尖峰平谷服务费占比
 		BigDecimal add1 = jianService.add(fengService).add(pingService).add(guService);
-		// 计算尖峰平谷充电到账占比
+		// 计算尖峰平谷充电量占比
 		BigDecimal add2 = jian.add(feng).add(ping).add(gu);
 		if (add.compareTo(new BigDecimal("0"))!=0){
-			chargingOrderTimeVO.setCapacityProportion(jianElectronic+"度/"+fengElectronic+"度/"+pingElectronic+"度/"+guElectronic+"度-"
-					+jianElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
-					+fengElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
-					+pingElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
-					+guElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%");
+			chargingOrderTimeVO.setCapacityProportion(jian+"度/"+feng+"度/"+ping+"度/"+gu+"度-"
+					+jian.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+					+feng.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+					+ping.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+					+gu.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%");
 			chargingOrderTimeVO.setServiceProportion(jianService+"元/"+fengService+"元/"+pingService+"元/"+guService+"元-"
 					+jianService.divide(add1,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
 					+fengService.divide(add1,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
 					+pingService.divide(add1,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
 					+guService.divide(add1,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%");
-			chargingOrderTimeVO.setElectronicProportion(jian+"元/"+feng+"元/"+ping+"元/"+gu+"元-"
-					+jian.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
-					+feng.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
-					+ping.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
-					+gu.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%");
+			chargingOrderTimeVO.setElectronicProportion(jianElectronic+"元/"+fengElectronic+"元/"+pingElectronic+"元/"+guElectronic+"元-"
+					+jianElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+					+fengElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+					+pingElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+					+guElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%");
 		}else{
 			chargingOrderTimeVO.setCapacityProportion(jianElectronic+"度/"+fengElectronic+"度/"+pingElectronic+"度/"+guElectronic+"度-"
 					+"0"+"%/"
@@ -1757,6 +1910,8 @@
 	public ChargingOrderListInfoVO chargingInfo(String uid) {
 		TChargingOrder chargingOrder= this.getById(uid);
 		ChargingOrderListInfoVO chargingOrderListInfoVO = new ChargingOrderListInfoVO();
+		chargingOrderListInfoVO.setStartTime(chargingOrder.getStartTime());
+		chargingOrderListInfoVO.setEndTime(chargingOrder.getEndTime());
 		chargingOrderListInfoVO.setStatus(chargingOrder.getStatus());
 		BigDecimal bigDecimal = new BigDecimal("0.006");
 		if (chargingOrder.getOrderAmount()!=null){
@@ -1833,18 +1988,21 @@
 
 			chargingOrderListInfoVO.setList(data6);
 		}
-		// 获取充电时间
-		UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
-		if (data5!=null){
-			if (data5.getTime_remaining()!=null){
-				chargingOrderListInfoVO.setChargingSecond(data5.getCumulative_charging_time()*60L+"");
-
-			}
+		if (chargingOrderListInfoVO.getStartTime()!=null && chargingOrderListInfoVO.getEndTime()!=null){
+			LocalDateTime startTime = chargingOrderListInfoVO.getStartTime();
+			LocalDateTime endTime = chargingOrderListInfoVO.getEndTime();
+			// 计算时间差 单位秒
+			long between = ChronoUnit.SECONDS.between(startTime, endTime);
+			chargingOrderListInfoVO.setChargingSecond(between+"");
 		}
 
 		if (chargingOrder.getAppUserCarId()!=null){
 			List<TAppUserCar> data3 = appUserCarClient.getCarByIds(Collections.singletonList(chargingOrder.getAppUserCarId())).getData();
-			if (data3!=null && !data3.isEmpty())chargingOrderListInfoVO.setLicensePlate(data3.get(0).getLicensePlate());
+			if (data3!=null && !data3.isEmpty()) {
+				chargingOrderListInfoVO.setLicensePlate(data3.get(0).getLicensePlate());
+			}
+		}else{
+			chargingOrderListInfoVO.setLicensePlate(chargingOrder.getPlateNum());
 		}
 		chargingOrderListInfoVO.setStartTime(chargingOrder.getStartTime());
 		chargingOrderListInfoVO.setEndTime(chargingOrder.getEndTime());
@@ -1852,7 +2010,12 @@
 		chargingOrderListInfoVO.setUid(chargingOrder.getId().toString());
 		chargingOrderListInfoVO.setCouponDiscountAmount(chargingOrder.getCouponDiscountAmount());
 		chargingOrderListInfoVO.setVipDiscountAmount(chargingOrder.getVipDiscountAmount());
-		chargingOrderListInfoVO.setSharingAmount(chargingOrder.getSharingAmount());
+		if (chargingOrder.getOrderSource().equals(2)){
+			chargingOrderListInfoVO.setSharingAmount(chargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_HALF_UP));
+		}else{
+			chargingOrderListInfoVO.setSharingAmount(chargingOrder.getSharingAmount());
+
+		}
 		// 查询费用明细列表
 		List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery()
 				.eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId())
@@ -1893,7 +2056,7 @@
 			chargingOrder.setChargingCapacity(query.getCharging_degree());
 			chargingOrder.setElectricity(query.getCharging_degree());
 			chargingOrder.setTotalElectricity(new BigDecimal(100 - query.getSoc()));
-			BmsDemandAndChargerExportation data = bmsDemandAndChargerExportationClient.getBmsDemandAndChargerExportation(chargingOrder.getCode()).getData();
+			BmsDemandAndChargerExportation data = bmsDemandAndChargerExportationClient.getBmsDemandAndChargerExportation(chargingOrder1.getCode()).getData();
 			if(null != data){
 				chargingOrder.setNeedElec(data.getBms_current_requirements());
 			}
@@ -1933,11 +2096,14 @@
 	 */
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class)
-	public void endChargeBillingCharge(TransactionRecordMessageVO vo) {
+	public R endChargeBillingCharge(TransactionRecordMessageVO vo) {
 		TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, vo.getTransaction_serial_number()));
+		if(null == chargingOrder){
+			return R.ok();
+		}
 		Integer status = chargingOrder.getStatus();
 		if(status == 5){
-			return;
+			return R.ok();
 		}
 		
 		//如果使用优惠券需要判断优惠券是否满足使用条件
@@ -2001,7 +2167,7 @@
 					AccountingStrategyDetailOrderVo vo1 = new AccountingStrategyDetailOrderVo();
 					BeanUtils.copyProperties(strategyDetail, vo1);
 					vo1.setChargingCapacity(sharp_peak_charge);
-					lists.add(vo1);
+					lists.add(0, vo1);
 				}
 				
 				//第二天的
@@ -2077,6 +2243,7 @@
 			}
 		}catch (Exception e){
 			e.printStackTrace();
+			R.fail("处理失败");
 		}
 		
 		//开始处理明细
@@ -2110,6 +2277,7 @@
 			BigDecimal vipDiscountAmount = BigDecimal.ZERO;
 			//计算优惠金额
 			if(null != chargingOrder.getVipDiscount()){
+				//0.58折
 				vipDiscountAmount = serviceCharge.multiply(new BigDecimal(1).subtract(chargingOrder.getVipDiscount()));
 				serviceCharge = serviceCharge.multiply(chargingOrder.getVipDiscount());
 			}
@@ -2124,67 +2292,48 @@
 			periodElectricPrice_total = periodElectricPrice_total.add(electrovalenc);
 			periodServicePrice_total = periodServicePrice_total.add(originalServicePrice);
 			total = total.add(electrovalenc.add(originalServicePrice));
-			
 		}
 		
-		
+		BigDecimal orderAmount = BigDecimal.valueOf(total.doubleValue());
+		//折扣金额
+		BigDecimal discountAmount = chargingOrder.getVipDiscountAmount();
 		//原金额
 		BigDecimal rechargeAmount = chargingOrder.getRechargeAmount();
-		BigDecimal vipDiscountAmount = chargingOrder.getVipDiscountAmount();
 		//总金额（充值金额+会员折扣金额）
-		BigDecimal decimal = rechargeAmount.add(vipDiscountAmount);
+		BigDecimal decimal = rechargeAmount.add(discountAmount);
 		//退款金额（已经计算了折扣优惠部分）
 		//如果充电总金额未使用完，则需要退回费用=(原金额/总金额)*(总金额-实际充电金额)
 		BigDecimal refundAmount = rechargeAmount.divide(decimal, new MathContext(4, RoundingMode.HALF_EVEN)).multiply(decimal.subtract(total));
-		BigDecimal orderAmount = BigDecimal.valueOf(total.doubleValue());
-		BigDecimal payAmount = BigDecimal.valueOf(total.doubleValue());
-		//折扣金额
-		BigDecimal discountAmount = BigDecimal.ZERO;
-		if(null != chargingOrder.getVipDiscount()){
-			TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
-			//判断会员是否还有充电优惠次数
-			GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
-			getAppUserVipDetail.setAppUserId(chargingOrder.getAppUserId());
-			getAppUserVipDetail.setVipId(appUser.getVipId());
-			TAppUserVipDetail data = appUserVipDetailClient.getAppUserVipDetail(getAppUserVipDetail).getData();
-			if(null != data && data.getChargeNum() > 0){
-				data.setChargeNum(data.getChargeNum() - 1);
-				appUserVipDetailClient.updateAppUserVipDetail(data);
-				
-				//服务费折扣
-				discountAmount = periodServicePrice_total.multiply((new BigDecimal(1).subtract(chargingOrder.getVipDiscount())));
-				TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
-				BigDecimal maximumDeduction = vip.getMaximumDeduction();
-				//普通会员有最高优惠限制
-				if(vip.getType() == 1 && discountAmount.compareTo(maximumDeduction) > 0){
-					discountAmount = maximumDeduction;
-				}
-			}
-		}
-		//会员折扣金额
-		discountAmount = discountAmount.setScale(4, RoundingMode.HALF_EVEN);
-		payAmount = payAmount.subtract(discountAmount);
+		//支付金额
+		BigDecimal payAmount = rechargeAmount.subtract(refundAmount);
+		//实际充值服务费-会员折扣
 		periodServicePrice_total = periodServicePrice_total.subtract(discountAmount);
-		
+
 		TChargingOrder order = new TChargingOrder();
 		order.setId(chargingOrder.getId());
 		order.setAppUserId(chargingOrder.getAppUserId());
 		UploadRealTimeMonitoringData uploadRealTimeMonitoringData = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
 		if(null != uploadRealTimeMonitoringData && null == chargingOrder.getEndMode()){
 			Integer soc = uploadRealTimeMonitoringData.getSoc();
-			order.setEndMode(soc > 98 ? 2 : 3);
-		}else{
-			order.setEndMode(1);
+			if(soc >= 98){
+				order.setEndMode(2);
+			}else if(chargingOrder.getResidualAmount().compareTo(new BigDecimal(1)) <= 0){
+				order.setEndMode(3);
+			}else{
+				order.setEndMode(0);
+			}
 		}
 		order.setResidualAmount(rechargeAmount.subtract(total).setScale(2, RoundingMode.HALF_EVEN));
 		order.setStartTime(LocalDateTime.parse(vo.getStart_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS")));
 		order.setEndTime(LocalDateTime.parse(vo.getEnd_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS")));
 		order.setStatus(5);
 		order.setOrderAmount(orderAmount.setScale(2, RoundingMode.HALF_EVEN));
-		order.setVipDiscountAmount(discountAmount.setScale(2, RoundingMode.HALF_EVEN));
 		order.setElectrovalence(periodElectricPrice_total.setScale(2, RoundingMode.HALF_EVEN));
 		order.setChargingCapacity(vo.getTotal_electricity());
 		order.setElectricity(vo.getTotal_electricity());
+		if(discountAmount.compareTo(BigDecimal.ZERO) == 0){
+			order.setVipDiscount(BigDecimal.valueOf(1));
+		}
 		
 		//计算优惠券
 		BigDecimal couponDiscount = BigDecimal.ZERO;
@@ -2238,7 +2387,9 @@
 		}
 		//优惠券优惠金额
 		couponDiscount = couponDiscount.setScale(4, RoundingMode.HALF_EVEN);
+		//退款金额+优惠券
 		refundAmount = refundAmount.add(couponDiscount);
+		//实际支付金额-优惠券
 		payAmount = payAmount.subtract(couponDiscount);
 		if(periodServicePrice_total.compareTo(BigDecimal.ZERO) > 0){
 			periodServicePrice_total = periodServicePrice_total.subtract(couponDiscount);
@@ -2250,6 +2401,14 @@
 		order.setRefundStatus(1);
 		this.updateById(order);
 		chargingOrder = this.getById(order.getId());
+		
+		//推送三方平台
+		if(2 == chargingOrder.getOrderSource()){
+			tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
+			tcecClient.notificationStopChargeResult(chargingOrder.getStartChargeSeq(), chargingOrder.getChargingGunId().toString(),
+					chargingOrder.getOperatorId());
+			tcecClient.notificationChargeOrderInfo(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
+		}
 		
 		//开始将优惠券优惠的金额添加到明细中
 		BigDecimal couponDiscountAmount = order.getCouponDiscountAmount();
@@ -2272,530 +2431,107 @@
 		chargingGun.setStatus(2);
 		chargingGun.setChargingPower(BigDecimal.ZERO);
 		chargingGunClient.updateChargingGunById(chargingGun);
+		//推送状态给三方平台
+		if(2 == chargingOrder.getOrderSource()){
+			tcecClient.pushChargingGunStatus(chargingGun.getFullNumber(), chargingGun.getStatus());
+		}
 		
 		//添加积分
-		TIntegralRule integralRule = integralRuleClient.getSet().getData();
-		if(null != integralRule){
-			TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
-			Integer num1 = JSON.parseObject(integralRule.getChargeCredit()).getInteger("num1");
-			Integer integral = chargingOrder.getServiceCharge().intValue() * num1;
-			if(null != appUser.getVipId()){
-				TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
-				Integer doubleIntegration = vip.getDoubleIntegration();
-				//双倍积分
-				if(1 == doubleIntegration){
-					integral *= 2;
+		if(1 == chargingOrder.getOrderSource()){
+			TIntegralRule integralRule = integralRuleClient.getSet().getData();
+			if(null != integralRule){
+				TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
+				Integer num1 = JSON.parseObject(integralRule.getChargeCredit()).getInteger("num1");
+				Integer integral = chargingOrder.getServiceCharge().intValue() * num1;
+				if(null != appUser.getVipId()){
+					TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
+					Integer doubleIntegration = vip.getDoubleIntegration();
+					//双倍积分
+					if(1 == doubleIntegration){
+						integral *= 2;
+					}
+				}
+				
+				if(integral > 0){
+					TAppUserIntegralChange appUserIntegralChange = new TAppUserIntegralChange();
+					appUserIntegralChange.setAppUserId(appUser.getId());
+					appUserIntegralChange.setChangeType(2);
+					appUserIntegralChange.setHistoricalIntegral(appUser.getPoints());
+					appUser.setPoints(appUser.getPoints() + integral);
+					appUserIntegralChange.setCurrentIntegral(appUser.getPoints());
+					appUserIntegralChange.setCreateTime(LocalDateTime.now());
+					appUserIntegralChange.setOrderCode(chargingOrder.getCode());
+					appUserIntegralChange.setExtension(chargingOrder.getId().toString());
+					appUserClient.updateAppUser(appUser);
+					appUserIntegralChangeClient.addAppUserIntegralChange(appUserIntegralChange);
 				}
 			}
 			
-			if(integral > 0){
-				TAppUserIntegralChange appUserIntegralChange = new TAppUserIntegralChange();
-				appUserIntegralChange.setAppUserId(appUser.getId());
-				appUserIntegralChange.setChangeType(2);
-				appUserIntegralChange.setHistoricalIntegral(appUser.getPoints());
-				appUser.setPoints(appUser.getPoints() + integral);
-				appUserIntegralChange.setCurrentIntegral(appUser.getPoints());
-				appUserIntegralChange.setCreateTime(LocalDateTime.now());
-				appUserIntegralChange.setOrderCode(chargingOrder.getCode());
-				appUserIntegralChange.setExtension(chargingOrder.getId().toString());
-				appUserClient.updateAppUser(appUser);
-				appUserIntegralChangeClient.addAppUserIntegralChange(appUserIntegralChange);
-			}
-		}
-
-		//计算用户标签
-		editUserTag(chargingOrder);
-		//用户推荐奖励
-		referralReward(chargingOrder);
-		
-		//开始构建退款费用
-		refundAmount = refundAmount.setScale(2, RoundingMode.HALF_EVEN);
-		if(refundAmount.compareTo(BigDecimal.ZERO) > 0){
-			Integer rechargePaymentType = chargingOrder.getRechargePaymentType();
-			//构建退款明细
-			TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
-			chargingOrderRefund.setChargingOrderId(chargingOrder.getId());
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
-			chargingOrderRefund.setRefundCode("CDF" + sdf.format(new Date()) + (Double.valueOf(Math.random() * 1000).intValue()));
-			chargingOrderRefund.setRefundAmount(refundAmount);
-			chargingOrderRefund.setRefundStatus(1);
-			chargingOrderRefund.setPayType(rechargePaymentType);
-			chargingOrderRefund.setRefundStatus(1);
-			chargingOrderRefund.setCode(chargingOrder.getCode());
-			chargingOrderRefund.setRefundTitle("充电完成退款");
-			chargingOrderRefund.setRefundContent("充电完成退款");
-			chargingOrderRefund.setRefundReason("充电完成退款");
-			chargingOrderRefund.setRefundRemark("实际充电消费金额：" + chargingOrder.getPaymentAmount());
-			chargingOrderRefund.setRefundTotalAmount(refundAmount);
-			chargingOrderRefund.setPayAmount(rechargeAmount);
-			if(1 == rechargePaymentType){
-				WxPaymentRefundModel model = new WxPaymentRefundModel();
-				model.setOut_trade_no(chargingOrder.getCode());
-				model.setOut_refund_no(chargingOrderRefund.getRefundCode());
-				model.setReason("充电完成退款");
-				model.setNotify_url("/payment/wx/refund/notify");
-				WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
-				amount.setRefund(refundAmount.multiply(new BigDecimal(100)).intValue());
-				amount.setTotal(rechargeAmount.multiply(new BigDecimal(100)).intValue());
-				amount.setCurrency("CNY");
-				model.setAmount(amount);
-				R<String> orderR = wxPaymentClient.refundOrderR(model);
-				if(200 == orderR.getCode()){
-					chargingOrderRefundService.save(chargingOrderRefund);
-				}
-			}
-			if(2 == rechargePaymentType){
-				RefundReq dto = new RefundReq();
-				dto.setOutTradeNo(chargingOrder.getCode());
-				dto.setOutRequestNo(chargingOrderRefund.getRefundCode());
-				dto.setRefundAmount(refundAmount.toString());
-				dto.setRefundReason("充电完成退款");
-				RefundResp resp = aliPaymentClient.refund(dto).getData();
-				if(null != resp){
-					chargingOrderRefundService.save(chargingOrderRefund);
-					this.chargingOrderStartupFailureWxRefund(chargingOrderRefund.getRefundCode(), resp.getTradeNo(), "SUCCESS", null);
-				}
-			}
+			//计算用户标签
+			editUserTag(chargingOrder);
+			//用户推荐奖励
+			referralReward(chargingOrder);
 			
+			//开始构建退款费用
+			refundAmount = refundAmount.setScale(2, RoundingMode.HALF_EVEN);
+			if(refundAmount.compareTo(BigDecimal.ZERO) > 0){
+				Integer rechargePaymentType = chargingOrder.getRechargePaymentType();
+				//构建退款明细
+				TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
+				chargingOrderRefund.setChargingOrderId(chargingOrder.getId());
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+				chargingOrderRefund.setRefundCode("CDF" + sdf.format(new Date()) + (Double.valueOf(Math.random() * 1000).intValue()));
+				chargingOrderRefund.setRefundAmount(refundAmount);
+				chargingOrderRefund.setRefundStatus(1);
+				chargingOrderRefund.setPayType(rechargePaymentType);
+				chargingOrderRefund.setRefundStatus(1);
+				chargingOrderRefund.setCode(chargingOrder.getCode());
+				chargingOrderRefund.setRefundTitle("充电完成退款");
+				chargingOrderRefund.setRefundContent("充电完成退款");
+				chargingOrderRefund.setRefundReason("充电完成退款");
+				chargingOrderRefund.setRefundRemark("实际充电消费金额：" + chargingOrder.getPaymentAmount());
+				chargingOrderRefund.setRefundTotalAmount(refundAmount);
+				chargingOrderRefund.setPayAmount(rechargeAmount);
+				if(1 == rechargePaymentType){
+					WxPaymentRefundModel model = new WxPaymentRefundModel();
+					model.setOut_trade_no(chargingOrder.getCode());
+					model.setOut_refund_no(chargingOrderRefund.getRefundCode());
+					model.setReason("充电完成退款");
+					model.setNotify_url("/payment/wx/refund/notify");
+					WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
+					amount.setRefund(refundAmount.multiply(new BigDecimal(100)).intValue());
+					amount.setTotal(rechargeAmount.multiply(new BigDecimal(100)).intValue());
+					amount.setCurrency("CNY");
+					model.setAmount(amount);
+					R<Map<String, Object>> result = wxPaymentClient.refundOrderR(model);
+					if(200 == result.getCode()){
+						chargingOrderRefundService.save(chargingOrderRefund);
+						//手续费
+						Map<String, Object> amount1 = (Map<String, Object>) result.getData().get("amount");
+						Object refund_fee1 = amount1.get("refund_fee");
+						BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));
+						chargingOrderRefund.setRefundFee(refund_fee);
+						chargingOrderRefundService.updateById(chargingOrderRefund);
+					}
+				}
+				if(2 == rechargePaymentType){
+					RefundReq dto = new RefundReq();
+					dto.setOutTradeNo(chargingOrder.getCode());
+					dto.setOutRequestNo(chargingOrderRefund.getRefundCode());
+					dto.setRefundAmount(refundAmount.toString());
+					dto.setRefundReason("充电完成退款");
+					RefundResp resp = aliPaymentClient.refund(dto).getData();
+					if(null != resp){
+						chargingOrderRefundService.save(chargingOrderRefund);
+						this.chargingOrderStartupFailureWxRefund(chargingOrderRefund.getRefundCode(), resp.getTradeNo(), "SUCCESS", null);
+					}
+				}
+				
+			}
 		}
+		return R.ok();
 	}
 	
-	
-//	/**
-//	 * 停止充电返回账单后计算费用
-//	 * @param vo
-//	 */
-//	@Override
-//	@GlobalTransactional(rollbackFor = Exception.class)
-//	public void endChargeBillingCharge1(TransactionRecordMessageVO vo) {
-//		TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, vo.getTransaction_serial_number()));
-//		Integer status = chargingOrder.getStatus();
-////		if(status == 5){
-////			return;
-////		}
-//
-//		//如果使用优惠券需要判断优惠券是否满足使用条件
-//		//根据实际的充电金额计算退款金额   退回费用=(原金额/总金额)*(总金额-实际充电金额)
-//		//退款金额=优惠券金额+剩余充电金额
-//		BigDecimal periodElectricPrice_total = BigDecimal.ZERO;
-//		BigDecimal periodServicePrice_total = BigDecimal.ZERO;
-//		BigDecimal total = BigDecimal.ZERO;
-//
-//		//获取订单的计费策略
-//		List<AccountingStrategyDetailOrder> accountingStrategyDetailOrderList = accountingStrategyDetailOrderClient.getAllAccountingStrategyDetailOrder(chargingOrder.getId()).getData();
-//		accountingStrategyDetailOrderList.get(accountingStrategyDetailOrderList.size() - 1).setEndTime("23:59");
-//		//开始处理计费明细数据和优惠数据
-////		chargingOrderAccountingStrategyService.remove(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId()));
-//		SimpleDateFormat sdfs = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//		List<AccountingStrategyDetailOrderVo> lists = new ArrayList<>();
-//		try {
-//			//跨天
-//			if(!vo.getStart_time().split(" ")[0].equals(vo.getEnd_time().split(" ")[0])){
-//				//当天的
-//				//开始通过计费策略遍历解析每个时段的费用明细
-//				String start_time = vo.getStart_time();
-//				String end_time = vo.getEnd_time();
-//				long start = sdfs.parse(start_time).getTime();
-//				long end = sdfs.parse(end_time).getTime();
-//				Class<? extends TransactionRecordMessageVO> clazz = vo.getClass();
-//				/**
-//				 * "start_time": "2025-01-03 23:06:43.00",
-//				 * 	"end_time": "2025-01-04 00:39:39.00",
-//				 */
-//				for (int i = accountingStrategyDetailOrderList.size(); i > 0; i--) {
-//					AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.get(i - 1);
-//					long time = sdfs.parse(start_time.split(" ")[0] + " " + strategyDetail.getEndTime() + ":00").getTime();
-//					if(time < start){
-//						break;
-//					}
-//					//阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）
-//					Object invoke = null;
-//					switch (strategyDetail.getType()){
-//						case 1:
-//							//充电度数
-//							invoke = clazz.getMethod("getSpike_charge" + (i)).invoke(vo);
-//							break;
-//						case 2:
-//							//充电度数
-//							invoke = clazz.getMethod("getPeak_charge" + (i)).invoke(vo);
-//							break;
-//						case 3:
-//							//充电度数
-//							invoke = clazz.getMethod("getFlat_charge" + (i)).invoke(vo);
-//							break;
-//						case 4:
-//							//充电度数
-//							invoke = clazz.getMethod("getValley_charge" + (i)).invoke(vo);
-//							break;
-//					}
-//					if(null == invoke || Double.valueOf(invoke.toString()) == 0){
-//						continue;
-//					}
-//					BigDecimal sharp_peak_charge = new BigDecimal(invoke.toString());
-//					AccountingStrategyDetailOrderVo vo1 = new AccountingStrategyDetailOrderVo();
-//					BeanUtils.copyProperties(strategyDetail, vo1);
-//					vo1.setChargingCapacity(sharp_peak_charge);
-//					lists.add(vo1);
-//				}
-//
-//				//第二天的
-//				//开始通过计费策略遍历解析每个时段的费用明细
-//				for (int i = 0; i < accountingStrategyDetailOrderList.size(); i++) {
-//					AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.get(i);
-//					long time = sdfs.parse(end_time.split(" ")[0] + " " + strategyDetail.getStartTime() + ":00").getTime();
-//					if(time > end){
-//						break;
-//					}
-//					//阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）
-//					Object invoke = null;
-//					switch (strategyDetail.getType()){
-//						case 1:
-//							//充电度数
-//							invoke = clazz.getMethod("getSpike_charge" + (i + 1)).invoke(vo);
-//							break;
-//						case 2:
-//							//充电度数
-//							invoke = clazz.getMethod("getPeak_charge" + (i + 1)).invoke(vo);
-//							break;
-//						case 3:
-//							//充电度数
-//							invoke = clazz.getMethod("getFlat_charge" + (i + 1)).invoke(vo);
-//							break;
-//						case 4:
-//							//充电度数
-//							invoke = clazz.getMethod("getValley_charge" + (i + 1)).invoke(vo);
-//							break;
-//					}
-//					if(null == invoke || Double.valueOf(invoke.toString()) == 0){
-//						continue;
-//					}
-//					BigDecimal sharp_peak_charge = new BigDecimal(invoke.toString());
-//					AccountingStrategyDetailOrderVo vo1 = new AccountingStrategyDetailOrderVo();
-//					BeanUtils.copyProperties(strategyDetail, vo1);
-//					vo1.setChargingCapacity(sharp_peak_charge);
-//					lists.add(vo1);
-//				}
-//			}else{
-//				for (int i = 0; i < accountingStrategyDetailOrderList.size(); i++) {
-//					Class<? extends TransactionRecordMessageVO> clazz = vo.getClass();
-//					AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.get(i);
-//					//阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）
-//					Object invoke = null;
-//					switch (strategyDetail.getType()){
-//						case 1:
-//							//充电度数
-//							invoke = clazz.getMethod("getSpike_charge" + (i + 1)).invoke(vo);
-//							break;
-//						case 2:
-//							//充电度数
-//							invoke = clazz.getMethod("getPeak_charge" + (i + 1)).invoke(vo);
-//							break;
-//						case 3:
-//							//充电度数
-//							invoke = clazz.getMethod("getFlat_charge" + (i + 1)).invoke(vo);
-//							break;
-//						case 4:
-//							//充电度数
-//							invoke = clazz.getMethod("getValley_charge" + (i + 1)).invoke(vo);
-//							break;
-//					}
-//					if(null == invoke || Double.valueOf(invoke.toString()) == 0){
-//						continue;
-//					}
-//					BigDecimal sharp_peak_charge = new BigDecimal(invoke.toString());
-//					AccountingStrategyDetailOrderVo vo1 = new AccountingStrategyDetailOrderVo();
-//					BeanUtils.copyProperties(strategyDetail, vo1);
-//					vo1.setChargingCapacity(sharp_peak_charge);
-//					lists.add(vo1);
-//				}
-//			}
-//		}catch (Exception e){
-//			e.printStackTrace();
-//		}
-//
-//		//开始处理明细
-//		for (int i = 0; i < lists.size(); i++) {
-//			AccountingStrategyDetailOrderVo strategyDetail = lists.get(i);
-//			BigDecimal sharp_peak_charge = strategyDetail.getChargingCapacity();
-//			TChargingOrderAccountingStrategy chargingOrderAccountingStrategy = new TChargingOrderAccountingStrategy();
-//			chargingOrderAccountingStrategy.setChargingOrderId(chargingOrder.getId());
-//			chargingOrderAccountingStrategy.setAccountingStrategyDetailId(strategyDetail.getId());
-//			chargingOrderAccountingStrategy.setType(strategyDetail.getType());
-//			chargingOrderAccountingStrategy.setElectrovalence(strategyDetail.getElectrovalence());
-//			chargingOrderAccountingStrategy.setServiceCharge(strategyDetail.getServiceCharge());
-//			chargingOrderAccountingStrategy.setCostServiceCharge(strategyDetail.getCostServiceCharge());
-//			if(i == 0){
-//				String time = vo.getStart_time().split(" ")[1];
-//				chargingOrderAccountingStrategy.setStartTime(time.substring(0, time.lastIndexOf(":")));
-//			}else{
-//				chargingOrderAccountingStrategy.setStartTime(strategyDetail.getStartTime());
-//			}
-//			if(i == lists.size() - 1){
-//				String time = vo.getEnd_time().split(" ")[1];
-//				chargingOrderAccountingStrategy.setEndTime(time.substring(0, time.lastIndexOf(":")));
-//			}else{
-//				chargingOrderAccountingStrategy.setEndTime(strategyDetail.getEndTime());
-//			}
-//
-//			//已充电总度数
-//			BigDecimal electrovalenc = strategyDetail.getElectrovalence().multiply(sharp_peak_charge);
-//			BigDecimal originalServicePrice = strategyDetail.getServiceCharge().multiply(sharp_peak_charge);
-//			BigDecimal serviceCharge = originalServicePrice;
-//			BigDecimal vipDiscountAmount = BigDecimal.ZERO;
-//			//计算优惠金额
-//			if(null != chargingOrder.getVipDiscount()){
-//				vipDiscountAmount = serviceCharge.multiply(new BigDecimal(1).subtract(chargingOrder.getVipDiscount()));
-//				serviceCharge = serviceCharge.multiply(chargingOrder.getVipDiscount());
-//			}
-//			chargingOrderAccountingStrategy.setChargingCapacity(sharp_peak_charge);
-//			chargingOrderAccountingStrategy.setPeriodElectricPrice(electrovalenc.setScale(4, RoundingMode.HALF_EVEN));
-//			chargingOrderAccountingStrategy.setPeriodServicePrice(serviceCharge.setScale(4, RoundingMode.HALF_EVEN));
-//			chargingOrderAccountingStrategy.setPeriodOriginalServicePrice(originalServicePrice.setScale(4, RoundingMode.HALF_EVEN));
-//			chargingOrderAccountingStrategy.setVipDiscountAmount(vipDiscountAmount.setScale(4, RoundingMode.HALF_EVEN));
-//			chargingOrderAccountingStrategy.setCreateTime(LocalDateTime.now());
-////			chargingOrderAccountingStrategyService.save(chargingOrderAccountingStrategy);
-//			System.err.println("----------"+JSON.toJSONString(chargingOrderAccountingStrategy));
-//
-//			periodElectricPrice_total = periodElectricPrice_total.add(electrovalenc);
-//			periodServicePrice_total = periodServicePrice_total.add(originalServicePrice);
-//			total = total.add(electrovalenc.add(originalServicePrice));
-//
-//		}
-//
-//
-//		//原金额
-//		BigDecimal rechargeAmount = chargingOrder.getRechargeAmount();
-//		BigDecimal vipDiscountAmount = chargingOrder.getVipDiscountAmount();
-//		//总金额（充值金额+会员折扣金额）
-//		BigDecimal decimal = rechargeAmount.add(vipDiscountAmount);
-//		//退款金额（已经计算了折扣优惠部分）
-//		//如果充电总金额未使用完，则需要退回费用=(原金额/总金额)*(总金额-实际充电金额)
-//		BigDecimal refundAmount = rechargeAmount.divide(decimal, new MathContext(4, RoundingMode.HALF_EVEN)).multiply(decimal.subtract(total));
-//		BigDecimal orderAmount = BigDecimal.valueOf(total.doubleValue());
-//		BigDecimal payAmount = BigDecimal.valueOf(total.doubleValue());
-//		//折扣金额
-//		BigDecimal discountAmount = BigDecimal.ZERO;
-////		if(null != chargingOrder.getVipDiscount()){
-////			TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
-////			//判断会员是否还有充电优惠次数
-////			GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
-////			getAppUserVipDetail.setAppUserId(chargingOrder.getAppUserId());
-////			getAppUserVipDetail.setVipId(appUser.getVipId());
-////			TAppUserVipDetail data = appUserVipDetailClient.getAppUserVipDetail(getAppUserVipDetail).getData();
-////			if(null != data && data.getChargeNum() > 0){
-////				data.setChargeNum(data.getChargeNum() - 1);
-////				appUserVipDetailClient.updateAppUserVipDetail(data);
-////
-////				//服务费折扣
-////				discountAmount = periodServicePrice_total.multiply((new BigDecimal(1).subtract(chargingOrder.getVipDiscount())));
-////				TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
-////				BigDecimal maximumDeduction = vip.getMaximumDeduction();
-////				//普通会员有最高优惠限制
-////				if(vip.getType() == 1 && discountAmount.compareTo(maximumDeduction) > 0){
-////					discountAmount = maximumDeduction;
-////				}
-////			}
-////		}
-//		//会员折扣金额
-//		discountAmount = discountAmount.setScale(4, RoundingMode.HALF_EVEN);
-//		payAmount = payAmount.subtract(discountAmount);
-//		periodServicePrice_total = periodServicePrice_total.subtract(discountAmount);
-//
-//		TChargingOrder order = new TChargingOrder();
-//		order.setId(chargingOrder.getId());
-//		order.setAppUserId(chargingOrder.getAppUserId());
-//		UploadRealTimeMonitoringData uploadRealTimeMonitoringData = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
-//		if(null != uploadRealTimeMonitoringData && null == chargingOrder.getEndMode()){
-//			Integer soc = uploadRealTimeMonitoringData.getSoc();
-//			order.setEndMode(soc > 98 ? 2 : 3);
-//		}else{
-//			order.setEndMode(1);
-//		}
-//		order.setResidualAmount(rechargeAmount.subtract(total).setScale(2, RoundingMode.HALF_EVEN));
-//		order.setStartTime(LocalDateTime.parse(vo.getStart_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS")));
-//		order.setEndTime(LocalDateTime.parse(vo.getEnd_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS")));
-//		order.setStatus(5);
-//		order.setOrderAmount(orderAmount.setScale(2, RoundingMode.HALF_EVEN));
-//		order.setVipDiscountAmount(discountAmount.setScale(2, RoundingMode.HALF_EVEN));
-//		order.setElectrovalence(periodElectricPrice_total.setScale(2, RoundingMode.HALF_EVEN));
-//		order.setChargingCapacity(vo.getTotal_electricity());
-//		order.setElectricity(vo.getTotal_electricity());
-//
-//		//计算优惠券
-//		BigDecimal couponDiscount = BigDecimal.ZERO;
-////		if(null != chargingOrder.getAppCouponId()){
-////			//判断实际充电金额是否满足优惠券使用条件，如果不满足则不适用优惠券。
-////			TAppCoupon appCoupon = appCouponClient.getAppCouponById(chargingOrder.getAppCouponId()).getData();
-////			String couponJson = appCoupon.getCouponJson();
-////			TCoupon tCoupon = JSON.parseObject(couponJson, TCoupon.class);
-////			Integer preferentialMode = tCoupon.getPreferentialMode();
-////			if(1 == preferentialMode){
-////				//满减
-////				if(payAmount.compareTo(tCoupon.getMeetTheConditions()) >= 0){
-////					BigDecimal couponDiscountAmount = tCoupon.getDiscountAmount();
-////					//如果优惠金额大于服务费金额，以服务费作为最大限制
-////					if(periodServicePrice_total.compareTo(couponDiscountAmount) < 0){
-////						couponDiscount = periodServicePrice_total;
-////						periodServicePrice_total = BigDecimal.ZERO;
-////					}else{
-////						couponDiscount = couponDiscountAmount;
-////					}
-////					appCoupon.setStatus(2);
-//////					appCouponClient.updateAppCoupon(appCoupon);
-////				}else{
-////					order.setAppCouponId(null);
-////					order.setCouponDiscountAmount(BigDecimal.ZERO);
-//////					appCouponClient.refund(chargingOrder.getAppCouponId().toString());
-////				}
-////			}
-////			if(2 == preferentialMode){
-////				//抵扣
-////				if(payAmount.compareTo(tCoupon.getMeetTheConditions()) >= 0){
-////					//折扣金额
-////					BigDecimal divide = payAmount.multiply(new BigDecimal(10).subtract(tCoupon.getDiscount())).divide(new BigDecimal(10));
-////					divide = divide.compareTo(tCoupon.getMaximumDiscountAmount()) > 0 ? tCoupon.getMaximumDiscountAmount() : divide;
-////					//如果优惠金额大于服务费金额，以服务费作为最大限制
-////					if(periodServicePrice_total.compareTo(divide) < 0){
-////						couponDiscount = periodServicePrice_total;
-////						periodServicePrice_total = BigDecimal.ZERO;
-////					}else{
-////						couponDiscount = divide;
-////					}
-////
-////					appCoupon.setStatus(2);
-////					appCouponClient.updateAppCoupon(appCoupon);
-////				}else{
-////					order.setAppCouponId(null);
-////					order.setCouponDiscountAmount(BigDecimal.ZERO);
-////					appCouponClient.refund(chargingOrder.getAppCouponId().toString());
-////				}
-////			}
-////		}
-//		//优惠券优惠金额
-//		couponDiscount = couponDiscount.setScale(4, RoundingMode.HALF_EVEN);
-//		refundAmount = refundAmount.add(couponDiscount);
-//		payAmount = payAmount.subtract(couponDiscount);
-//		if(periodServicePrice_total.compareTo(BigDecimal.ZERO) > 0){
-//			periodServicePrice_total = periodServicePrice_total.subtract(couponDiscount);
-//		}
-//		order.setCouponDiscountAmount(couponDiscount.setScale(2, RoundingMode.HALF_EVEN));
-//		order.setServiceCharge(periodServicePrice_total.setScale(2, RoundingMode.HALF_EVEN));
-//		order.setPaymentAmount(payAmount.setScale(2, RoundingMode.HALF_EVEN));
-//		order.setRefundAmount(refundAmount.setScale(2, RoundingMode.HALF_EVEN));
-//		order.setRefundStatus(1);
-////		this.updateById(order);
-//		System.err.println("----------"+JSON.toJSONString(order));
-////		chargingOrder = this.getById(order.getId());
-////
-////		//开始将优惠券优惠的金额添加到明细中
-////		BigDecimal couponDiscountAmount = order.getCouponDiscountAmount();
-////		if(null != couponDiscountAmount && couponDiscountAmount.compareTo(BigDecimal.ZERO) > 0){
-////			List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.list(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().eq(TChargingOrderAccountingStrategy::getChargingOrderId, order.getId()));
-////			BigDecimal reduce = list.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
-////			for (TChargingOrderAccountingStrategy chargingOrderAccountingStrategy : list) {
-////				BigDecimal periodServicePrice = chargingOrderAccountingStrategy.getPeriodServicePrice();
-////				BigDecimal multiply = couponDiscountAmount.multiply(periodServicePrice.divide(reduce, new MathContext(4, RoundingMode.HALF_EVEN)));
-////				periodServicePrice = periodServicePrice.subtract(multiply);
-////				chargingOrderAccountingStrategy.setPeriodServicePrice(periodServicePrice.setScale(2, RoundingMode.HALF_EVEN));
-////				chargingOrderAccountingStrategy.setCouponDiscountAmount(multiply.setScale(2, RoundingMode.HALF_EVEN));
-////			}
-//////			chargingOrderAccountingStrategyService.updateBatchById(list);
-////		}
-////
-////		// 将枪状态重置为空闲
-////		TChargingGun chargingGun = new TChargingGun();
-////		chargingGun.setId(chargingOrder.getChargingGunId());
-////		chargingGun.setStatus(2);
-////		chargingGun.setChargingPower(BigDecimal.ZERO);
-//////		chargingGunClient.updateChargingGunById(chargingGun);
-////
-////		//添加积分
-////		TIntegralRule integralRule = integralRuleClient.getSet().getData();
-////		if(null != integralRule){
-////			TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
-////			Integer num1 = JSON.parseObject(integralRule.getChargeCredit()).getInteger("num1");
-////			Integer integral = chargingOrder.getServiceCharge().intValue() * num1;
-////			if(null != appUser.getVipId()){
-////				TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
-////				Integer doubleIntegration = vip.getDoubleIntegration();
-////				//双倍积分
-////				if(1 == doubleIntegration){
-////					integral *= 2;
-////				}
-////			}
-////
-////			if(integral > 0){
-////				TAppUserIntegralChange appUserIntegralChange = new TAppUserIntegralChange();
-////				appUserIntegralChange.setAppUserId(appUser.getId());
-////				appUserIntegralChange.setChangeType(2);
-////				appUserIntegralChange.setHistoricalIntegral(appUser.getPoints());
-////				appUser.setPoints(appUser.getPoints() + integral);
-////				appUserIntegralChange.setCurrentIntegral(appUser.getPoints());
-////				appUserIntegralChange.setCreateTime(LocalDateTime.now());
-////				appUserIntegralChange.setOrderCode(chargingOrder.getCode());
-////				appUserIntegralChange.setExtension(chargingOrder.getId().toString());
-////				appUserClient.updateAppUser(appUser);
-////				appUserIntegralChangeClient.addAppUserIntegralChange(appUserIntegralChange);
-////			}
-////		}
-////
-////		//计算用户标签
-////		editUserTag(chargingOrder);
-////		//用户推荐奖励
-////		referralReward(chargingOrder);
-////
-////		//开始构建退款费用
-////		if(refundAmount.compareTo(BigDecimal.ZERO) > 0){
-////			Integer rechargePaymentType = chargingOrder.getRechargePaymentType();
-////			//构建退款明细
-////			TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
-////			chargingOrderRefund.setChargingOrderId(chargingOrder.getId());
-////			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
-////			chargingOrderRefund.setRefundCode("CDF" + sdf.format(new Date()) + (Double.valueOf(Math.random() * 1000).intValue()));
-////			chargingOrderRefund.setRefundAmount(refundAmount);
-////			chargingOrderRefund.setRefundStatus(1);
-////			chargingOrderRefund.setPayType(rechargePaymentType);
-////			chargingOrderRefund.setRefundStatus(1);
-////			chargingOrderRefund.setCode(chargingOrder.getCode());
-////			chargingOrderRefund.setRefundTitle("充电完成退款");
-////			chargingOrderRefund.setRefundContent("充电完成退款");
-////			chargingOrderRefund.setRefundReason("充电完成退款");
-////			chargingOrderRefund.setRefundRemark("实际充电消费金额：" + chargingOrder.getPaymentAmount());
-////			chargingOrderRefund.setRefundTotalAmount(refundAmount);
-////			chargingOrderRefund.setPayAmount(rechargeAmount);
-////			if(1 == rechargePaymentType){
-////				WxPaymentRefundModel model = new WxPaymentRefundModel();
-////				model.setOut_trade_no(chargingOrder.getCode());
-////				model.setOut_refund_no(chargingOrderRefund.getRefundCode());
-////				model.setReason("充电完成退款");
-////				model.setNotify_url("/payment/wx/refund/notify");
-////				WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
-////				amount.setRefund(refundAmount.multiply(new BigDecimal(100)).intValue());
-////				amount.setTotal(rechargeAmount.multiply(new BigDecimal(100)).intValue());
-////				amount.setCurrency("CNY");
-////				model.setAmount(amount);
-////				R<String> orderR = wxPaymentClient.refundOrderR(model);
-////				if(200 == orderR.getCode()){
-////					chargingOrderRefundService.save(chargingOrderRefund);
-////				}
-////			}
-////			if(2 == rechargePaymentType){
-////				RefundReq dto = new RefundReq();
-////				dto.setOutTradeNo(chargingOrder.getCode());
-////				dto.setOutRequestNo(chargingOrderRefund.getCode());
-////				dto.setRefundAmount(refundAmount.toString());
-////				dto.setRefundReason("充电完成退款");
-////				RefundResp resp = aliPaymentClient.refund(dto).getData();
-////				if(null != resp){
-////					AjaxResult success = chargingOrderStartupFailureWxRefund(resp.getOutTradeNo(), resp.getTradeNo(), "SUCCESS", null);
-////					if(success.isSuccess()){
-////						chargingOrderRefundService.save(chargingOrderRefund);
-////					}
-////				}
-////			}
-////
-////		}
-//	}
 	
 	
 	
@@ -2887,6 +2623,10 @@
 	private TVipOrderService vipOrderService;
 	@Resource
 	private TVipOrderRefundService vipOrderRefundService;
+	
+	
+	
+	
 	@Override
 	public R payRefund(PayOrderRefundDto payOrderQueryDto) {
 			if (payOrderQueryDto.getType()==1){
@@ -2927,12 +2667,18 @@
 					amount.setTotal(tChargingOrder.getRechargeAmount().multiply(new BigDecimal(100)).intValue());
 					amount.setCurrency("CNY");
 					model.setAmount(amount);
-					R<String> orderR = wxPaymentClient.refundOrderR(model);
+					R<Map<String, Object>> orderR = wxPaymentClient.refundOrderR(model);
 					if(200 == orderR.getCode()){
 						tChargingOrder.setRefundStatus(2);
 						tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
 						this.baseMapper.updateById(tChargingOrder);
 						chargingOrderRefundService.save(chargingOrderRefund);
+						//手续费
+						Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
+						Object refund_fee1 = amount1.get("refund_fee");
+						BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));
+						chargingOrderRefund.setRefundFee(refund_fee);
+						chargingOrderRefundService.updateById(chargingOrderRefund);
 					}
 				}
 
@@ -2944,7 +2690,6 @@
 					dto.setRefundReason("取消订单");
 					RefundResp resp = aliPaymentClient.refund(dto).getData();
 					if(null != resp){
-						SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-DDTHH:mm:ss+TIMEZONE");
 						chargingOrderRefund.setRefundStatus(2);
 						chargingOrderRefund.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
 						this.baseMapper.updateById(tChargingOrder);
@@ -2952,11 +2697,6 @@
 
 					}
 				}
-
-
-
-
-
 			}
 			if (payOrderQueryDto.getType()==2){
 				TShoppingOrder tChargingOrder = shoppingOrderService.getById(payOrderQueryDto.getOrderId());
@@ -2995,12 +2735,18 @@
 					amount.setTotal(tChargingOrder.getPaymentAmount().multiply(new BigDecimal(100)).intValue());
 					amount.setCurrency("CNY");
 					model.setAmount(amount);
-					R<String> orderR = wxPaymentClient.refundOrderR(model);
+					R<Map<String, Object>> orderR = wxPaymentClient.refundOrderR(model);
 					if(200 == orderR.getCode()){
 						tChargingOrder.setRefundStatus(2);
 						tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
 						shoppingOrderService.updateById(tChargingOrder);
 						shoppingOrderRefundService.save(chargingOrderRefund);
+						//手续费
+						Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
+						Object refund_fee1 = amount1.get("refund_fee");
+						BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));
+						chargingOrderRefund.setRefundFee(refund_fee);
+						shoppingOrderRefundService.updateById(chargingOrderRefund);
 					}
 				}
 
@@ -3012,16 +2758,10 @@
 					dto.setRefundReason("取消订单");
 					RefundResp resp = aliPaymentClient.refund(dto).getData();
 					if(null != resp){
-						SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-DDTHH:mm:ss+TIMEZONE");
-
 						tChargingOrder.setRefundStatus(2);
 						tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
-
-
 						shoppingOrderService.updateById(tChargingOrder);
-
 						shoppingOrderRefundService.save(chargingOrderRefund);
-
 					}
 				}
 
@@ -3032,8 +2772,6 @@
 			if (tChargingOrder.getPaymentAmount().compareTo(payOrderQueryDto.getRefundAmount())==-1){
 				return R.fail("退款金额需小于支付金额");
 			}
-
-
 			TVipOrderRefund chargingOrderRefund = new TVipOrderRefund();
 			chargingOrderRefund.setVipOrderId(tChargingOrder.getId());
 			chargingOrderRefund.setRefundAmount(payOrderQueryDto.getRefundAmount());
@@ -3062,12 +2800,18 @@
 				amount.setTotal(tChargingOrder.getPaymentAmount().multiply(new BigDecimal(100)).intValue());
 				amount.setCurrency("CNY");
 				model.setAmount(amount);
-				R<String> orderR = wxPaymentClient.refundOrderR(model);
+				R<Map<String, Object>> orderR = wxPaymentClient.refundOrderR(model);
 				if(200 == orderR.getCode()){
 					tChargingOrder.setRefundStatus(2);
 					tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
 					vipOrderService.updateById(tChargingOrder);
 					vipOrderRefundService.save(chargingOrderRefund);
+					//手续费
+					Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
+					Object refund_fee1 = amount1.get("refund_fee");
+					BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));
+					chargingOrderRefund.setRefundFee(refund_fee);
+					vipOrderRefundService.updateById(chargingOrderRefund);
 				}
 			}
 
@@ -3079,23 +2823,13 @@
 				dto.setRefundReason("取消订单");
 				RefundResp resp = aliPaymentClient.refund(dto).getData();
 				if(null != resp){
-					SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-DDTHH:mm:ss+TIMEZONE");
-
 					tChargingOrder.setRefundStatus(2);
 					tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
-
-
 					vipOrderService.updateById(tChargingOrder);
-
 					vipOrderRefundService.save(chargingOrderRefund);
-
 				}
 			}
-
 		}
-
-
-
 		return R.ok();
 	}
 
@@ -3107,11 +2841,7 @@
 	 */
 	@Override
 	public TChargingOrder getChargingOrderByLicensePlate(GetChargingOrderByLicensePlate query) {
-		TAppUserCar appUserCar = appUserCarClient.getAppUserCarByLicensePlate(query.getLicensePlate()).getData();
-		if(null == appUserCar){
-			return null;
-		}
-		TChargingOrder one = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getAppUserCarId, appUserCar.getId())
+		TChargingOrder one = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getPlateNum, query.getLicensePlate())
 				.eq(TChargingOrder::getDelFlag, 0).between(TChargingOrder::getStartTime, query.getStartTime(), LocalDateTime.now())
 				.eq(TChargingOrder::getRechargePaymentStatus, 2).in(TChargingOrder::getStatus, Arrays.asList(4, 5)));
 		return one;
@@ -3183,8 +2913,8 @@
 
 			}
 			// 累加分佣
-			if (tChargingOrder.getSharingAmount()!=null) {
-				sharingAmount = sharingAmount.add(tChargingOrder.getSharingAmount());
+			if (tChargingOrder.getOrderSource()==2) {
+				sharingAmount = sharingAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
 			}
 			// 累加电费
 			if (tChargingOrder.getElectrovalence()!=null) {
@@ -3192,8 +2922,11 @@
 			}
 			// 累加服务费
 			if (tChargingOrder.getServiceCharge()!=null){
-				serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
-
+				if (tChargingOrder.getOrderSource()==2) {
+					serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
+				}else{
+					serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
+				}
 			}
 			// 累加会员折扣
 			if (tChargingOrder.getVipDiscountAmount()!=null){
@@ -3205,7 +2938,7 @@
 			}
 			if (tChargingOrder.getPaymentAmount()!=null){
 				paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
-				orderCommission = orderCommission.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006"))
+				orderCommission = orderCommission.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006"))
 						.setScale(2,BigDecimal.ROUND_DOWN));
 			}
 
@@ -3350,6 +3083,8 @@
 		return pageInfo;
 	}
 
+	@Autowired
+	private TChargingOrderService chargingOrderService;
 	@Override
 	public SettlementTotalVO settlementTotal(String time) {
 		Long userId = tokenService.getLoginUser().getUserid();
@@ -3364,6 +3099,14 @@
 		if (siteIds.isEmpty()){
 			siteIds.add(-1);
 		}
+		List<Site> siteList = siteClient.getSiteAll().getData();
+		List<TChargingGun> gunList = chargingGunClient.getAllGun().getData();
+		List<TChargingPile> pileList = chargingGunClient.getAllPile().getData();
+		List<TAppUser> userList = appUserClient.getAllUser().getData();
+		List<TAppUserCar> carList = appUserCarClient.getAllCar().getData();
+		List<TChargingOrder> totalOrder = chargingOrderService.list(new LambdaQueryWrapper<>(TChargingOrder.class)
+				.eq(TChargingOrder::getRechargePaymentStatus, 2));
+		List<TChargingOrderRefund> totalRefund = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getRefundStatus, 2).list();
 		SettlementTotalVO res = new SettlementTotalVO();
 		List<TSettlementConfirm> list1 = tSettlementConfirmMapper.settlementTotal(time,siteIds);
 		LocalDateTime parse = LocalDateTime.parse(time, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
@@ -3411,9 +3154,9 @@
 		for (TSettlementConfirm tSettlementConfirm : list1) {
 			tSettlementConfirm.setXuhao(i);
 			tSettlementConfirm.setMetering(tSettlementConfirm.getSupplyElectronic());
-			List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(tSettlementConfirm.getSiteId())).getData();
-			if (!data1.isEmpty()){
-				tSettlementConfirm.setSiteName(data1.get(0).getName());
+			Site site = siteList.stream().filter(e -> e.getId().equals(tSettlementConfirm.getSiteId())).findFirst().orElse(null);
+			if (site!=null){
+				tSettlementConfirm.setSiteName(site.getName());
 			}
 			if (tSettlementConfirm.getMeteringElectronic()!=null){
 				meteringElectronic = meteringElectronic.add(tSettlementConfirm.getMeteringElectronic());
@@ -3458,26 +3201,17 @@
 					eq.between("end_time", tSettlementConfirm.getStartTime(), tSettlementConfirm.getEndTime());
 					break;
 			}
-			List<TChargingOrder> tChargingOrders = this.baseMapper.selectList(eq);
-			Map<String,TChargingOrder> map = new HashMap<>();
-			StringBuilder stringBuilder = new StringBuilder();
-			for (TChargingOrder tChargingOrder : tChargingOrders) {
-				stringBuilder.append(tChargingOrder.getCode()).append(",");
-
-			}
+			List<TChargingOrder> tChargingOrders = totalOrder.stream().filter(e-> e.getPayTime()
+					.isBefore(tSettlementConfirm.getEndTime())
+					&& e.getPayTime().isAfter(tSettlementConfirm.getStartTime())&&e.getSiteId().equals(tSettlementConfirm.getSiteId())).collect(Collectors.toList());
 			// 充电总时长
-
-			Long temp = 1L;
-			if (StringUtils.hasLength(stringBuilder.toString())){
-				String substring = stringBuilder.substring(0, stringBuilder.length() - 1);
-				for (String s : substring.split(",")) {
-					UploadRealTimeMonitoringData data6 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(s).getData();
-					if (data6!=null){
-						temp+=(data6.getCumulative_charging_time()*60);
-
-					}
-
-				}
+			Long temp = 0L;
+			for (TChargingOrder tChargingOrder : tChargingOrders) {
+				LocalDateTime startTime = tChargingOrder.getStartTime();
+				LocalDateTime endTime = tChargingOrder.getEndTime();
+				// 计算时间差 单位秒
+				long between = ChronoUnit.SECONDS.between(startTime, endTime);
+				temp+=between;
 			}
 			List<TChargingPile> data = siteClient.getPileListBySiteId(tSettlementConfirm.getSiteId()).getData();
 			// 计算充电桩的功率平均值
@@ -3489,7 +3223,7 @@
 
 			tSettlementConfirm.setIncome(tSettlementConfirm.getElectrovalence().add(tSettlementConfirm.getServiceCharge()));
 			//利用率=充电量/（桩数量*功率*时间）
-			List<TChargingPile> data2 = chargingPileClient.getChargingPileBySiteId(tSettlementConfirm.getSiteId()).getData();
+			List<TChargingPile> data2 = pileList.stream().filter(e -> e.getSiteId().equals(tSettlementConfirm.getSiteId())).collect(Collectors.toList());
 			BigDecimal bigDecimal2 = new BigDecimal("0");
 
 			if (data2!=null && (!data2.isEmpty())){
@@ -3605,11 +3339,16 @@
 		if (siteIds.isEmpty()){
 			siteIds.add(-1);
 		}
+		List<Site> siteList = siteClient.getSiteAll().getData();
+		List<TChargingGun> gunList = chargingGunClient.getAllGun().getData();
+		List<TChargingPile> pileList = chargingGunClient.getAllPile().getData();
+		List<TAppUser> userList = appUserClient.getAllUser().getData();
+		List<TAppUserCar> carList = appUserCarClient.getAllCar().getData();
+		List<TChargingOrder> totalOrder = chargingOrderService.list(new LambdaQueryWrapper<>(TChargingOrder.class)
+				.eq(TChargingOrder::getRechargePaymentStatus, 2));
 		SettlementTotalVO res = new SettlementTotalVO();
 		List<TSettlementConfirm> list1 = tSettlementConfirmMapper.settlementTotal(time,siteIds);
 		LocalDateTime parse = LocalDateTime.parse(time, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-		// 减少一个月
-		LocalDateTime minus = parse.minusMonths(1);
 		List<TSettlementConfirm> list2 = tSettlementConfirmMapper.settlementTotal(time,siteIds);
 		// 合计
 		List<TSettlementConfirm> total = new ArrayList<>();
@@ -3652,7 +3391,7 @@
 		for (TSettlementConfirm tSettlementConfirm : list1) {
 			tSettlementConfirm.setXuhao(i);
 			tSettlementConfirm.setMetering(tSettlementConfirm.getSupplyElectronic());
-			List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(tSettlementConfirm.getSiteId())).getData();
+			List<Site> data1 = siteList.stream().filter(e -> e.getId().equals(tSettlementConfirm.getSiteId())).collect(Collectors.toList());
 			if (!data1.isEmpty()){
 				tSettlementConfirm.setSiteName(data1.get(0).getName());
 			}
@@ -3699,26 +3438,18 @@
 					eq.between("end_time", tSettlementConfirm.getStartTime(), tSettlementConfirm.getEndTime());
 					break;
 			}
-			List<TChargingOrder> tChargingOrders = this.baseMapper.selectList(eq);
-			Map<String,TChargingOrder> map = new HashMap<>();
-			StringBuilder stringBuilder = new StringBuilder();
-			for (TChargingOrder tChargingOrder : tChargingOrders) {
-				stringBuilder.append(tChargingOrder.getCode()).append(",");
 
-			}
+			List<TChargingOrder> tChargingOrders = totalOrder.stream().filter(e-> e.getPayTime()
+					.isBefore(tSettlementConfirm.getEndTime())
+					&& e.getPayTime().isAfter(tSettlementConfirm.getStartTime())&&e.getSiteId().equals(tSettlementConfirm.getSiteId())).collect(Collectors.toList());
 			// 充电总时长
-
-			Long temp = 1L;
-			if (StringUtils.hasLength(stringBuilder.toString())){
-				String substring = stringBuilder.substring(0, stringBuilder.length() - 1);
-				for (String s : substring.split(",")) {
-					UploadRealTimeMonitoringData data6 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(s).getData();
-					if (data6!=null){
-						temp+=(data6.getCumulative_charging_time()*60);
-
-					}
-
-				}
+			Long temp = 0L;
+			for (TChargingOrder tChargingOrder : tChargingOrders) {
+				LocalDateTime startTime = tChargingOrder.getStartTime();
+				LocalDateTime endTime = tChargingOrder.getEndTime();
+				// 计算时间差 单位秒
+				long between = ChronoUnit.SECONDS.between(startTime, endTime);
+				temp+=between;
 			}
 			List<TChargingPile> data = siteClient.getPileListBySiteId(tSettlementConfirm.getSiteId()).getData();
 			// 计算充电桩的功率平均值
@@ -3972,4 +3703,178 @@
 	public Long countCar(List<String> brands) {
 		return this.baseMapper.countCar(brands);
 	}
+	
+	
+	/**
+	 * 添加三方平台充电订单数据
+	 * @param query
+	 */
+	@Override
+	public R addTripartitePlatformOrder(AddTripartitePlatformOrder query) {
+		//检查当前枪是否是正在使用中
+		TChargingOrder one = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, query.getChargingGunId())
+				.in(TChargingOrder::getStatus, Arrays.asList(1, 2, 3)).eq(TChargingOrder::getDelFlag, 0));
+		if(null != one){
+			return R.fail("充电枪正在充电中，启动失败");
+		}
+		
+		//构建订单数据
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+		TChargingOrder chargingOrder = new TChargingOrder();
+		String code = "CD" + Double.valueOf(Math.random() * 1000).intValue() + sdf.format(new Date());
+		chargingOrder.setCode(code);
+		chargingOrder.setOrderType(1);
+		chargingOrder.setOrderClassification(1);
+		TChargingGun tChargingGun = chargingGunClient.getChargingGunById(query.getChargingGunId()).getData();
+		TChargingPile chargingPile = chargingPileClient.getChargingPileById(tChargingGun.getChargingPileId()).getData();
+		chargingOrder.setSiteId(tChargingGun.getSiteId());
+		chargingOrder.setChargingPileId(tChargingGun.getChargingPileId());
+		chargingOrder.setChargingGunId(query.getChargingGunId());
+		chargingOrder.setRechargePaymentType(query.getRechargePaymentType());
+		chargingOrder.setRechargePaymentStatus(2);
+		chargingOrder.setRechargeAmount(query.getPaymentAmount());
+		chargingOrder.setVipDiscountAmount(BigDecimal.ZERO);
+		chargingOrder.setOrderSource(2);
+		Operator operator = operatorClient.getOperator(query.getOperatorId()).getData();
+		chargingOrder.setOperatorId(operator.getId());
+		chargingOrder.setAppUserId(operator.getId().longValue());
+		chargingOrder.setTripartitePlatformName(operator.getName());
+		chargingOrder.setStartChargeSeq(query.getStartChargeSeq());
+		//车辆信息
+		if(StringUtils.hasLength(query.getPlateNum())){
+			TAppUserCar appUserCar = appUserCarClient.getAppUserCarByLicensePlate(query.getPlateNum()).getData();
+			if(null != appUserCar){
+				chargingOrder.setAppUserCarId(appUserCar.getId());
+			}
+			chargingOrder.setPlateNum(query.getPlateNum());
+		}
+		
+		
+		chargingOrder.setTitle("【充电桩充电】" + chargingPile.getNumber() + "号桩/" + tChargingGun.getCode() + "号枪");
+		chargingOrder.setStatus(2);
+		chargingOrder.setPayTime(LocalDateTime.now());
+		chargingOrder.setChargeAmount(chargingOrder.getRechargeAmount());
+		this.save(chargingOrder);
+		
+		Integer accountingStrategyId = tChargingGun.getAccountingStrategyId();
+		if(null == accountingStrategyId){
+			Site site = siteClient.getSiteByIds(Arrays.asList(tChargingGun.getSiteId())).getData().get(0);
+			//查询站点上面的计费策略
+			accountingStrategyId = site.getAccountingStrategyId();
+		}
+		TAccountingStrategy accountingStrategy = accountingStrategyClient.getAccountingStrategyById(accountingStrategyId).getData();
+		
+		//添加订单的计费策略
+		List<TAccountingStrategyDetail> strategyDetailList = accountingStrategyDetailClient.getListByAccountingStrategyId(accountingStrategyId).getData();
+		AccountingStrategyOrder accountingStrategyOrder = new AccountingStrategyOrder();
+		BeanUtils.copyProperties(accountingStrategy, accountingStrategyOrder);
+		accountingStrategyOrder.setChargingOrderId(chargingOrder.getId());
+		accountingStrategyOrderService.save(accountingStrategyOrder);
+		List<AccountingStrategyDetailOrder> list1 = new ArrayList<>();
+		for (TAccountingStrategyDetail tAccountingStrategyDetail : strategyDetailList) {
+			AccountingStrategyDetailOrder accountingStrategyDetailOrder = new AccountingStrategyDetailOrder();
+			BeanUtils.copyProperties(tAccountingStrategyDetail, accountingStrategyDetailOrder);
+			accountingStrategyDetailOrder.setChargingOrderId(chargingOrder.getId());
+			list1.add(accountingStrategyDetailOrder);
+		}
+		accountingStrategyDetailOrderService.saveBatch(list1);
+		
+		
+		//添加安全检测数据到缓存中，每步安全检测完成后需要更新缓存数据
+		PreChargeCheck preChargeCheck = new PreChargeCheck();
+		preChargeCheck.setElectronicLockLock(false);
+		preChargeCheck.setInsulationTesting(false);
+		preChargeCheck.setSecureConnectionDetection(false);
+		preChargeCheck.setStartupSuccess(1);
+		String key = "AQJC_" + chargingOrder.getChargingGunId();
+		redisService.setCacheObject(key, preChargeCheck, 24L, TimeUnit.HOURS);
+		
+		BigDecimal rechargeAmount = chargingOrder.getRechargeAmount();
+		//调用远程启动充电消息
+		PlatformStartCharging platformStartCharging = new PlatformStartCharging();
+		platformStartCharging.setTransaction_serial_number(chargingOrder.getCode());
+		platformStartCharging.setCharging_pile_code(chargingPile.getCode());
+		platformStartCharging.setCharging_gun_code(tChargingGun.getCode());
+		//使用订单id作为逻辑卡号
+		platformStartCharging.setCard_number(chargingOrder.getId().toString());
+		platformStartCharging.setAccount_balance(rechargeAmount);
+		log.info(chargingOrder.getCode() + "：-------------------远程调起开始充电请求-------------------" + platformStartCharging.toString());
+		sendMessageClient.platformStartCharging(platformStartCharging);
+		//异步线程检测远程启动的应答结果。如果失败，则需要全额退款
+		Long id = chargingOrder.getId();
+		//执行5分钟的定时任务检测
+		ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+		scheduler.scheduleAtFixedRate(()->{
+			if(timingDetection(id)){
+				scheduler.shutdown();
+			}
+		}, 5, 1, TimeUnit.SECONDS);
+		
+		//推送三方平台订单状态
+		tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
+		return R.ok();
+	}
+	
+	
+	/**
+	 * 三方平台停止充电操作
+	 * @param startChargeSeq
+	 * @return
+	 */
+	@Override
+	public R tripartitePlatformStopCharge(String startChargeSeq) {
+		TChargingOrder order = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getStartChargeSeq, startChargeSeq));
+		Integer status = order.getStatus();
+		if(status != 3){
+			return R.fail("还未开始充电");
+		}
+		if(status == 4 || status == 5){
+			return R.fail("不能重复操作");
+		}
+		TChargingOrder chargingOrder = new TChargingOrder();
+		chargingOrder.setId(order.getId());
+		chargingOrder.setAppUserId(order.getOperatorId().longValue());
+		chargingOrder.setEndTime(LocalDateTime.now());
+		chargingOrder.setStatus(4);
+		chargingOrder.setEndMode(1);
+		this.updateById(chargingOrder);
+		
+		tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
+		
+		String code1 = order.getCode();
+		TChargingGun chargingGun = chargingGunClient.getChargingGunById(order.getChargingGunId()).getData();
+		//异步线程处理停机
+		ExecutorService cachedThreadPool = Executors.newFixedThreadPool(1);
+		cachedThreadPool.execute(()->{
+			//调用硬件停止充电，停止成功后开始计算费用退款
+			TChargingPile chargingPile = chargingPileClient.getChargingPileById(order.getChargingPileId()).getData();
+			PlatformStopCharging platformStopCharging = new PlatformStopCharging();
+			platformStopCharging.setCharging_pile_code(chargingPile.getCode());
+			platformStopCharging.setCharging_gun_code(chargingGun.getCode());
+			sendMessageClient.platformStopCharging(platformStopCharging);
+			log.info(code1 + "：-------------------远程停止充电请求-------------------");
+			log.info(platformStopCharging.toString());
+		});
+		return R.ok();
+	}
+	
+	
+	/**
+	 * 获取充电后没有扣除费用的数据
+	 * @return
+	 */
+	@Override
+	public R getNotPaymentChargingOrder() {
+		List<TChargingOrder> list = this.list(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getPaymentAmount, 0)
+				.ne(TChargingOrder::getElectricity, 0).in(TChargingOrder::getStatus, Arrays.asList(4, 5)));
+		List<Map<String, Object>> mapList = new ArrayList<>();
+		for (TChargingOrder order : list) {
+			TransactionRecord transactionRecord = transactionRecordClient.findTransactionRecord(order.getCode()).getData();
+			Map<String, Object> map = new HashMap<>();
+			map.put("order", order);
+			map.put("transactionRecord", transactionRecord);
+			mapList.add(map);
+		}
+		return R.ok(mapList);
+	}
 }

--
Gitblit v1.7.1