From aa7727d8ed9eca34f8126c3dc5a80fbdf9ad56cd Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 11 九月 2024 12:02:57 +0800
Subject: [PATCH] 添加系统日志

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java |  836 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 691 insertions(+), 145 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 b99ebf0..24cb4c4 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
@@ -1,10 +1,11 @@
 package com.ruoyi.order.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.account.api.feignClient.*;
 import com.ruoyi.account.api.model.*;
@@ -16,11 +17,9 @@
 import com.ruoyi.common.core.dto.ChargingOrderGroup;
 import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.BasePage;
 import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.integration.api.feignClient.ChargingHandshakeClient;
 import com.ruoyi.integration.api.feignClient.PlatformStartChargingReplyClient;
 import com.ruoyi.integration.api.feignClient.SendMessageClient;
@@ -32,20 +31,28 @@
 import com.ruoyi.integration.api.feignClient.*;
 import com.ruoyi.integration.api.model.*;
 import com.ruoyi.integration.api.vo.GetPlatformStopChargingReply;
+import com.ruoyi.order.api.dto.SettlementConfirmAdd;
 import com.ruoyi.order.api.feignClient.AccountingStrategyDetailOrderClient;
 import com.ruoyi.order.api.feignClient.ChargingOrderAccountingStrategyClient;
 import com.ruoyi.order.api.model.*;
 import com.ruoyi.order.api.query.ChargingOrderQuery;
+import com.ruoyi.order.api.query.SettlementListQuery;
 import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery;
 import com.ruoyi.order.api.vo.*;
 import com.ruoyi.order.dto.*;
 import com.ruoyi.order.mapper.TChargingOrderMapper;
+import com.ruoyi.order.mapper.TSettlementConfirmMapper;
+import com.ruoyi.order.service.TChargingOrderAccountingStrategyService;
+import com.ruoyi.order.service.TChargingOrderRefundService;
+import com.ruoyi.order.service.TChargingOrderService;
+import com.ruoyi.order.service.TOrderEvaluateService;
 import com.ruoyi.order.service.*;
 import com.ruoyi.other.api.domain.TCoupon;
 import com.ruoyi.other.api.domain.TGoods;
 import com.ruoyi.order.vo.ChargingOrderListInfoVO;
 import com.ruoyi.other.api.domain.TIntegralRule;
 import com.ruoyi.other.api.feignClient.IntegralRuleClient;
+import com.ruoyi.other.api.feignClient.OtherClient;
 import com.ruoyi.other.api.feignClient.RoleSiteClient;
 import com.ruoyi.other.api.feignClient.UserSiteClient;
 import com.ruoyi.payment.api.feignClient.AliPaymentClient;
@@ -54,8 +61,8 @@
 import com.ruoyi.payment.api.model.RefundResp;
 import com.ruoyi.payment.api.model.WxPaymentRefundModel;
 import com.ruoyi.payment.api.vo.*;
-import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.feignClient.SysUserClient;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import io.seata.spring.annotation.GlobalTransactional;
 import io.swagger.annotations.ApiModelProperty;
 import org.slf4j.Logger;
@@ -74,7 +81,6 @@
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -91,13 +97,16 @@
 public class TChargingOrderServiceImpl extends ServiceImpl<TChargingOrderMapper, TChargingOrder> implements TChargingOrderService {
 	
 	private Logger log = LoggerFactory.getLogger(TChargingOrderServiceImpl.class);
-	
+
 	@Resource
 	private ChargingGunClient chargingGunClient;
-	
+	@Resource
+	private TSettlementConfirmMapper tSettlementConfirmMapper;
+
 	@Resource
 	private SiteClient siteClient;
-	
+
+
 	@Resource
 	private AppUserCarClient appUserCarClient;
 	@Resource
@@ -105,7 +114,6 @@
 
 	@Resource
 	private ChargingPileClient chargingPileClient;
-
 
 	@Resource
 	private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;
@@ -118,7 +126,6 @@
 	
 	@Resource
 	private AliPaymentClient aliPaymentClient;
-	
 
 	@Resource
 	private AppCouponClient appCouponClient;
@@ -141,45 +148,45 @@
 	@Resource
 	private TOrderEvaluateService orderEvaluateService;
 
-	
+
 	@Resource
 	private AccountingStrategyDetailClient accountingStrategyDetailClient;
-	
+
 	@Resource
 	private AccountingStrategyDetailOrderClient accountingStrategyDetailOrderClient;
-	
+
 	@Resource
 	private AccountingStrategyClient accountingStrategyClient;
-	
+
 	@Resource
 	private PlatformStartChargingReplyClient platformStartChargingReplyClient;
-	
+
 	@Resource
 	private TChargingOrderRefundService chargingOrderRefundService;
-	
+
 	@Resource
 	private PlatformStopChargingReplyClient platformStopChargingReplyClient;
-	
+
 	@Resource
 	private AccountingStrategyOrderService accountingStrategyOrderService;
-	
+
 	@Resource
 	private AccountingStrategyDetailOrderService accountingStrategyDetailOrderService;
-	
+
 	@Resource
 	private InviteUserClient inviteUserClient;
-	
+
 	@Resource
 	private AppUserIntegralChangeClient appUserIntegralChangeClient;
-	
+
 	@Resource
 	private IntegralRuleClient integralRuleClient;
-	
+
 	//计数器
 	private Map<String, Integer> counter_map = new HashMap<>();
-	
-	
-	
+
+
+
 
 	/**
 	 * 获取小程序充电记录列表数据
@@ -438,12 +445,19 @@
 					chargingOrder.setVipDiscountAmount(discountAmount);
 				}
 			}
+
 		}
 		this.save(chargingOrder);
-		
+
 		//添加订单的计费策略
-		TAccountingStrategy accountingStrategy = accountingStrategyClient.getAccountingStrategyById(tChargingGun.getAccountingStrategyId()).getData();
-		List<TAccountingStrategyDetail> strategyDetailList = accountingStrategyDetailClient.getListByAccountingStrategyId(tChargingGun.getAccountingStrategyId()).getData();
+		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());
@@ -456,7 +470,7 @@
 			list1.add(accountingStrategyDetailOrder);
 		}
 		accountingStrategyDetailOrderService.saveBatch(list1);
-		
+
 		//会员优惠折扣将其计入增加充电时长（增加总充电金额）
 		//如果充电总金额未使用完，则需要退回费用=(原金额/总金额)*(总金额-实际充电金额)
 		if(1 == addChargingOrder.getPaymentType()){
@@ -504,7 +518,7 @@
 		chargingOrder.setRechargePaymentStatus(2);
 		chargingOrder.setRechargeSerialNumber(transaction_id);
 		chargingOrder.setStatus(2);
-		
+
 		//添加安全检测数据到缓存中，每步安全检测完成后需要更新缓存数据
 		PreChargeCheck preChargeCheck = new PreChargeCheck();
 		preChargeCheck.setElectronicLockLock(false);
@@ -526,7 +540,7 @@
 		//计算电费金额和服务费
 		BigDecimal serviceCharge = strategyDetail.getServiceCharge().multiply(degrees);
 		BigDecimal electrovalence = strategyDetail.getElectrovalence().multiply(degrees);
-		
+
 		//再处理会员折扣
 		BigDecimal discount = BigDecimal.ZERO;
 		TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
@@ -544,8 +558,8 @@
 		electrovalence = electrovalence.add(discount);
 		chargingOrder.setChargeAmount(electrovalence);
 		this.updateById(chargingOrder);
-		
-		
+
+
 		TChargingPile chargingPile = chargingPileClient.getChargingPileById(chargingGun.getChargingPileId()).getData();
 		//调用远程启动充电消息
 		PlatformStartCharging platformStartCharging = new PlatformStartCharging();
@@ -636,7 +650,7 @@
 				model.setOut_trade_no(chargingOrder.getCode());
 				model.setOut_refund_no(chargingOrderRefund.getRefundCode());
 				model.setReason("充电失败，取消充电订单");
-				model.setNotify_url("http://127.0.0.1:9000/order/t-charging-order/chargingOrderStartupFailureWxRefund");
+				model.setNotify_url("http://221.182.45.100:9000/order/t-charging-order/chargingOrderStartupFailureWxRefund");
 				WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
 				amount.setRefund(rechargeAmount.multiply(new BigDecimal(100)).intValue());
 				amount.setTotal(rechargeAmount.multiply(new BigDecimal(100)).intValue());
@@ -662,11 +676,11 @@
 					}
 				}
 			}
-			
+
 		}
 	}
-	
-	
+
+
 	/**
 	 * 启动失败后微信退款的回调处理
 	 * @param out_refund_no
@@ -685,10 +699,10 @@
 		}
 		return AjaxResult.success();
 	}
-	
-	
-	
-	
+
+
+
+
 	/**
 	 * 获取充电中的详情
 	 * @param id
@@ -751,7 +765,7 @@
 		chargingOrder.setStatus(4);
 		chargingOrder.setEndMode(1);
 		this.updateById(chargingOrder);
-		
+
 		//异步线程处理停机
 		ExecutorService cachedThreadPool = Executors.newFixedThreadPool(1);
 		cachedThreadPool.execute(()->{
@@ -776,7 +790,7 @@
 					}
 					continue;
 				}
-				
+
 				if(0 == reply.getStop_result()){
 					String failure_cause = "";
 					switch (reply.getFailure_cause()){
@@ -796,14 +810,14 @@
 					log.error("停机失败：订单号：{}，失败原因：{}", chargingOrder.getCode(), failure_cause);
 					throw new RuntimeException(failure_cause);
 				}
-				
+
 				//计算费用，处理退款
 				endCharge(chargingOrder);
 				break;
 			}
 		});
-		
-		
+
+
 		//处理推荐奖励(被推荐首单奖励)
 		TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
 		long count = this.count(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getAppUserId, chargingOrder.getAppUserId())
@@ -838,15 +852,15 @@
 			appUserIntegralChange.setCurrentIntegral(appUser1.getPoints() + num1);
 			appUserIntegralChange.setCreateTime(LocalDateTime.now());
 			appUserIntegralChangeClient.addAppUserIntegralChange(appUserIntegralChange);
-			
+
 			appUser1.setPoints(appUser1.getPoints() + num1);
 			appUserClient.updateAppUser(appUser1);
 		}
-		
+
 		return AjaxResult.success();
 	}
-	
-	
+
+
 	/**
 	 * 手动结束后的费用计算和退款逻辑
 	 */
@@ -873,14 +887,14 @@
 			orderAmount = orderAmount.divide(chargingOrder.getVipDiscount().divide(new BigDecimal(10)));
 			chargingOrder.setOrderAmount(total);
 		}
-		
+
 		if(chargingOrder.getEndMode() == 2){
 			chargingOrder.setEndMode(refundAmount.compareTo(BigDecimal.ZERO) > 0 ? 2 : 3);
 		}
 		chargingOrder.setStatus(5);
 		chargingOrder.setPaymentAmount(payAmount);
 		this.updateById(chargingOrder);
-		
+
 		//计算优惠券
 		if(null != chargingOrder.getAppCouponId()){
 			//判断实际充电金额是否满足优惠券使用条件，如果不满足则不适用优惠券。
@@ -916,7 +930,7 @@
 				}
 			}
 		}
-		
+
 		if(null != chargingOrder.getVipDiscount()){
 			BigDecimal subtract = orderAmount.subtract(total);
 			chargingOrder.setVipDiscountAmount(subtract);
@@ -946,7 +960,7 @@
 				model.setOut_trade_no(chargingOrder.getCode());
 				model.setOut_refund_no(chargingOrderRefund.getRefundCode());
 				model.setReason("充电完成退款");
-				model.setNotify_url("http://127.0.0.1:9000/order/t-charging-order/chargingOrderStartupFailureWxRefund");
+				model.setNotify_url("http://221.182.45.100:9000/order/t-charging-order/chargingOrderStartupFailureWxRefund");
 				WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
 				amount.setRefund(refundAmount.multiply(new BigDecimal(100)).intValue());
 				amount.setTotal(rechargeAmount.multiply(new BigDecimal(100)).intValue());
@@ -972,9 +986,9 @@
 					}
 				}
 			}
-			
+
 		}
-		
+
 	}
 
 
@@ -1117,32 +1131,32 @@
 	}
 
 	@Override
-	public Map<String, BigDecimal> countAll(LocalDate sixBefore) {
+	public Map<String, Object> countAll(LocalDate sixBefore) {
 		return this.baseMapper.countAll(sixBefore);
 	}
 
 	@Override
-	public List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds) {
+	public List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds) {
 		return this.baseMapper.getSumByType(chargingOrderIds);
 	}
 
 	@Override
-	public List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds) {
+	public List<Map<String, Object>> getDateData(List<Long> chargingOrderIds) {
 		return this.baseMapper.getDateData(chargingOrderIds);
 	}
 
 	@Override
-	public List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds) {
+	public List<Map<String, Object>> getWeekData(List<Long> chargingOrderIds) {
 		return this.baseMapper.getWeekData(chargingOrderIds);
 	}
 
 	@Override
-	public List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds) {
+	public List<Map<String, Object>> getMonthData(List<Long> chargingOrderIds) {
 		return this.baseMapper.getMonthData(chargingOrderIds);
 	}
 
 	@Override
-	public List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds) {
+	public List<Map<String, Object>> getYearData(List<Long> chargingOrderIds) {
 		return this.baseMapper.getYearData(chargingOrderIds);
 	}
 	@Resource
@@ -1176,10 +1190,12 @@
 			if (!data.isEmpty()) {
 				chargingOrderListVO.setSiteName(data.get(0).getName());
 			}
-			TChargingGun data1 = chargingGunClient.getChargingGunById(chargingOrderListVO.getChargingGunId()).getData();
-			TChargingPile data2 = chargingPileClient.getChargingPileById(chargingOrderListVO.getChargingPileId()).getData();
-			if (data2 != null && data1 != null) {
-				chargingOrderListVO.setTerminalName(data2.getName() + "-" + data1.getName());
+			if (chargingOrderListVO.getChargingGunId()!=null && chargingOrderListVO.getChargingPileId()!=null){
+				TChargingGun data1 = chargingGunClient.getChargingGunById(chargingOrderListVO.getChargingGunId()).getData();
+				TChargingPile data2 = chargingPileClient.getChargingPileById(chargingOrderListVO.getChargingPileId()).getData();
+				if (data2 != null && data1 != null) {
+					chargingOrderListVO.setTerminalName(data2.getName() + "-" + data1.getName());
+				}
 			}
 			// 获取充电时间
 			UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrderListVO.getCode()).getData();
@@ -1190,20 +1206,30 @@
 				}
 			}
 			// 获取开始SOC 结束soc
-			List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrderListVO.getCode()).getData();
-			if (!data6.isEmpty()){
-				// 第一条数据soc为开始 最后一条数据soc为结束soc
-				chargingOrderListVO.setStartSoc(data6.get(0).getSoc().toString());
-				chargingOrderListVO.setEndSoc(data6.get(data6.size()-1).getSoc().toString());
+			if (chargingOrderListVO.getCode()!=null){
+				List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrderListVO.getCode()).getData();
+				if (!data6.isEmpty()){
+					// 第一条数据soc为开始 最后一条数据soc为结束soc
+					chargingOrderListVO.setStartSoc(data6.get(0).getSoc().toString());
+					chargingOrderListVO.setEndSoc(data6.get(data6.size()-1).getSoc().toString());
+				}
 			}
-			TAppUser data3 = appUserClient.getUserById(chargingOrderListVO.getAppUserId()).getData();
-			List<Long> carId = new ArrayList<>();
-			if (chargingOrderListVO.getAppUserCarId() != null) {
-				carId.add(chargingOrderListVO.getAppUserCarId());
-				List<TAppUserCar> data4 = appUserCarClient.getCarByIds(carId).getData();
-				if (!data4.isEmpty()) chargingOrderListVO.setLicensePlate(data4.get(0).getLicensePlate());
+
+			if (chargingOrderListVO.getAppUserId()!=null){
+				TAppUser data3 = appUserClient.getUserById(chargingOrderListVO.getAppUserId()).getData();
+				List<Long> carId = new ArrayList<>();
+				if (data3!=null){
+					if (chargingOrderListVO.getAppUserCarId() != null) {
+						carId.add(chargingOrderListVO.getAppUserCarId());
+						if (!carId.isEmpty()){
+							List<TAppUserCar> data4 = appUserCarClient.getCarByIds(carId).getData();
+							if (data4!=null && !data4.isEmpty()) chargingOrderListVO.setLicensePlate(data4.get(0).getLicensePlate());
+						}
+					}
+					if (data3 != null) chargingOrderListVO.setPhone(data3.getPhone());
+
+				}
 			}
-			if (data3 != null) chargingOrderListVO.setPhone(data3.getPhone());
 			List<TChargingOrderAccountingStrategy> list2 = chargingOrderAccountingStrategyService.lambdaQuery()
 					.eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrderListVO.getId()).list();
 			// 尖峰平谷充电量 度数
@@ -1229,14 +1255,25 @@
 				}
 			}
 			total = total.add(jian).add(feng).add(ping).add(gu);
-			chargingOrderListVO.setElectronicProportion(
-					jian.divide(total,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%(尖)/"
-					+feng.divide(total,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%(峰)/"
-					+ping.divide(total,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%(平)/"
-					+gu.divide(total,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%(谷)");
+			if (total.compareTo(new BigDecimal("0")) != 0){
+				chargingOrderListVO.setElectronicProportion(
+						jian.divide(total,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%(尖)/"
+								+feng.divide(total,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%(峰)/"
+								+ping.divide(total,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%(平)/"
+								+gu.divide(total,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%(谷)");
+			}else{
+				chargingOrderListVO.setElectronicProportion(
+						"0"+"%(尖)/"+
+						"0"+"%(峰)/"+
+						"0"+"%(平)/"+
+						"0"+"%(谷)");
+			}
+
 		}
 		// 不分页
-		List<ChargingOrderListVO> list1 = this.baseMapper.chargingList1(dto,startTime1,startTime2,endTime1,endTime2);
+		PageInfo<ChargingOrderListVO> pageInfo1 = new PageInfo<>(1,999999999);
+		List<ChargingOrderListVO> list1 = this.baseMapper.chargingList(pageInfo1,dto,startTime1,startTime2,endTime1,endTime2);
+		chargingOrderTimeVO.setExportList(list1);
 		chargingOrderTimeVO.setOrderCount(list1.size());
 		// 计算充电总度数
 		BigDecimal electronic = new BigDecimal("0");
@@ -1262,33 +1299,34 @@
 		BigDecimal ping = new BigDecimal("0");
 		BigDecimal gu = new BigDecimal("0");
 		for (ChargingOrderListVO chargingOrderListVO : list1) {
-			electronic = electronic.add(chargingOrderListVO.getChargingCapacity());
-			paymentAmount = paymentAmount.add(chargingOrderListVO.getPaymentAmount());
-			electrovalence = electrovalence.add(chargingOrderListVO.getElectrovalence());
-			serviceCharge = serviceCharge.add(chargingOrderListVO.getServiceCharge());
+			if (chargingOrderListVO.getChargingCapacity()!=null)electronic = electronic.add(chargingOrderListVO.getChargingCapacity());
+
+			if (chargingOrderListVO.getPaymentAmount()!=null)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 = chargingOrderAccountingStrategyService.lambdaQuery()
 					.eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrderListVO.getId()).list();
 			for (TChargingOrderAccountingStrategy temp : list2) {
 				switch (temp.getType()){
 					case 1:
-						jian = jian.add(temp.getChargingCapacity());
-						jianElectronic = jianElectronic.add(temp.getChargingCapacity());
-						jianService = jianService.add(temp.getChargingCapacity());
+						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:
-						feng = feng.add(temp.getChargingCapacity());
-						fengElectronic = fengElectronic.add(temp.getChargingCapacity());
-						fengService = fengService.add(temp.getChargingCapacity());
+						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:
-						ping = ping.add(temp.getChargingCapacity());
-						pingElectronic = pingElectronic.add(temp.getChargingCapacity());
-						pingService = pingService.add(temp.getChargingCapacity());
+						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:
-						gu = gu.add(temp.getChargingCapacity());
-						guElectronic = guElectronic.add(temp.getChargingCapacity());
-						guService = guService.add(temp.getChargingCapacity());
+						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;
 				}
 			}
@@ -1304,69 +1342,117 @@
 		BigDecimal add1 = jianService.add(fengService).add(pingService).add(guService);
 		// 计算尖峰平谷充电到账占比
 		BigDecimal add2 = jian.add(feng).add(ping).add(gu);
-		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.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"))+"%");
+		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.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"))+"%");
+		}else{
+			chargingOrderTimeVO.setCapacityProportion(jianElectronic+"度/"+fengElectronic+"度/"+pingElectronic+"度/"+guElectronic+"度-"
+					+"0"+"%/"
+					+"0"+"%/"
+					+"0"+"%/"
+					+"0"+"%");
+			chargingOrderTimeVO.setServiceProportion(jianService+"元/"+fengService+"元/"+pingService+"元/"+guService+"元-"
+					+"0"+"%/"
+					+"0"+"%/"
+					+"0"+"%/"
+					+"0"+"%");
+			chargingOrderTimeVO.setElectronicProportion(jian+"元/"+feng+"元/"+ping+"元/"+gu+"元-"
+					+"0"+"%/"
+					+"0"+"%/"
+					+"0"+"%/"
+					+"0"+"%");
+		}
+		pageInfo.setRecords(list);
 		chargingOrderTimeVO.setList(pageInfo);
 		return chargingOrderTimeVO;
 	}
 
-	@Override
-	public R payRefund(PayOrderRefundDto payOrderQueryDto) {
-		return null;
-	}
+//	@Override
+//	public R payRefund(PayOrderRefundDto payOrderQueryDto) {
+//		return null;
+//	}
 
 	@Override
 	public ChargingOrderListInfoVO chargingInfo(String uid) {
 		TChargingOrder chargingOrder= this.getById(uid);
 
 		ChargingOrderListInfoVO chargingOrderListInfoVO = new ChargingOrderListInfoVO();
+		chargingOrderListInfoVO.setElectrovalence(chargingOrder.getElectrovalence());
+		chargingOrderListInfoVO.setServiceCharge(chargingOrder.getServiceCharge());
+		if (chargingOrder.getElectrovalence()!=null && chargingOrder.getServiceCharge()!=null){
+			chargingOrderListInfoVO.setTotal(chargingOrder.getElectrovalence().add(chargingOrder.getServiceCharge()));
+		}else{
+			chargingOrderListInfoVO.setTotal(new BigDecimal("0"));
+		}
+		if (chargingOrderListInfoVO.getTotal().compareTo(new BigDecimal("0"))>0){
+			if (chargingOrder.getCouponDiscountAmount()!=null&& chargingOrder.getVipDiscountAmount()!=null&& chargingOrder.getSharingAmount()!=null&& chargingOrder.getCommissionAmount()!=null){
+				chargingOrderListInfoVO.setRealTotal(chargingOrderListInfoVO.getTotal().subtract(chargingOrder.getCouponDiscountAmount()).subtract(chargingOrder.getVipDiscountAmount()).subtract(chargingOrder.getSharingAmount()).subtract(chargingOrder.getCommissionAmount()));
+			}else{
+				chargingOrderListInfoVO.setRealTotal(chargingOrderListInfoVO.getTotal());
+			}
+		}else{
+			chargingOrderListInfoVO.setRealTotal(new BigDecimal("0"));
+		}
 		chargingOrderListInfoVO.setCode(chargingOrder.getCode());
 		List<Site> data = siteClient.getSiteByIds(Arrays.asList(chargingOrder.getSiteId())).getData();
 		if (!data.isEmpty()){
 			chargingOrderListInfoVO.setSiteName(data.get(0).getName());
 			chargingOrderListInfoVO.setSiteAddress(data.get(0).getAddress());
 		}
-		TChargingGun data1 = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
-		TChargingPile data2 = chargingPileClient.getChargingPileById(data1.getChargingPileId()).getData();
-
-		if (data1!=null){
-			chargingOrderListInfoVO.setGunCode(data1.getCode());
-			chargingOrderListInfoVO.setTerminalName(data2.getName()+data1.getName());
+		if (chargingOrder.getChargingGunId()!=null){
+			TChargingGun data1 = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
+			if (data1!=null){
+				TChargingPile data2 = chargingPileClient.getChargingPileById(data1.getChargingPileId()).getData();
+				if (data2!=null){
+					chargingOrderListInfoVO.setGunCode(data1.getCode());
+					chargingOrderListInfoVO.setTerminalName(data2.getName()+data1.getName());
+				}
+			}
 		}
+
 		chargingOrderListInfoVO.setEndMode(chargingOrder.getEndMode());
-		// todo 周一完善
-		// 获取开始SOC 结束soc
-		List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrder.getCode()).getData();
-		if (!data6.isEmpty()){
-			// 第一条数据soc为开始 最后一条数据soc为结束soc
-			chargingOrderListInfoVO.setStartSoc(data6.get(0).getSoc().toString());
-			chargingOrderListInfoVO.setEndSoc(data6.get(data6.size()-1).getSoc().toString());
-			chargingOrderListInfoVO.setChargingCapacity(data6.get(data6.size()-1).getCharging_degree());
-			chargingOrderListInfoVO.setChargingSecond(data6.get(data6.size()-1).getCumulative_charging_time()*60+"");
 
+		// 获取开始SOC 结束soc
+		if (chargingOrder.getCode()!=null){
+			List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrder.getCode()).getData();
+			if (data6!=null){
+				if (!data6.isEmpty()){
+					// 第一条数据soc为开始 最后一条数据soc为结束soc
+					chargingOrderListInfoVO.setStartSoc(data6.get(0).getSoc().toString());
+					chargingOrderListInfoVO.setEndSoc(data6.get(data6.size()-1).getSoc().toString());
+					chargingOrderListInfoVO.setChargingCapacity(data6.get(data6.size()-1).getCharging_degree());
+					chargingOrderListInfoVO.setChargingSecond(data6.get(data6.size()-1).getCumulative_charging_time()*60+"");
+					SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+					for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : data6) {
+						uploadRealTimeMonitoringData.setCreateTime(simpleDateFormat.format(uploadRealTimeMonitoringData.getCreate_time()));
+					}
+				}
+			}
+			chargingOrderListInfoVO.setList(data6);
 		}
+
+
 		if (chargingOrder.getAppUserCarId()!=null){
 			List<TAppUserCar> data3 = appUserCarClient.getCarByIds(Collections.singletonList(chargingOrder.getAppUserCarId())).getData();
-			if (!data3.isEmpty())chargingOrderListInfoVO.setLicensePlate(data3.get(0).getLicensePlate());
+			if (data3!=null && !data3.isEmpty())chargingOrderListInfoVO.setLicensePlate(data3.get(0).getLicensePlate());
 		}
 		chargingOrderListInfoVO.setStartTime(chargingOrder.getStartTime());
 		chargingOrderListInfoVO.setEndTime(chargingOrder.getEndTime());
 		chargingOrderListInfoVO.setId(chargingOrder.getId());
 		chargingOrderListInfoVO.setUid(chargingOrder.getId().toString());
-		chargingOrderListInfoVO.setList(data6);
 		chargingOrderListInfoVO.setCouponDiscountAmount(chargingOrder.getCouponDiscountAmount());
 		chargingOrderListInfoVO.setVipDiscountAmount(chargingOrder.getVipDiscountAmount());
 		chargingOrderListInfoVO.setSharingAmount(chargingOrder.getSharingAmount());
@@ -1378,6 +1464,7 @@
 		chargingOrderListInfoVO.setList1(list);
 		return chargingOrderListInfoVO;
 	}
+
 
 	/**
 	 * 处理充电订单实时监控数据相关的业务逻辑
@@ -1463,7 +1550,7 @@
 					chargingOrderAccountingStrategyService.save(chargingOrderAccountingStrategy1);
 				}
 			}
-			
+
 			List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.list(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>()
 					.eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId()));
 			BigDecimal t = BigDecimal.ZERO;
@@ -1477,8 +1564,8 @@
 			this.updateById(chargingOrder);
 		}
 	}
-	
-	
+
+
 	/**
 	 * 自动结束充电后的处理逻辑
 	 * @param orderCode
@@ -1494,10 +1581,10 @@
 		chargingOrder.setStatus(5);
 		chargingOrder.setEndMode(endMode);
 		this.updateById(chargingOrder);
-		
+
 		//计算费用，处理退款
 		endCharge(chargingOrder);
-	
+
 		//处理推荐奖励(被推荐首单奖励)
 		TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
 		long count = this.count(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getAppUserId, chargingOrder.getAppUserId())
@@ -1532,12 +1619,12 @@
 			appUserIntegralChange.setCurrentIntegral(appUser1.getPoints() + num1);
 			appUserIntegralChange.setCreateTime(LocalDateTime.now());
 			appUserIntegralChangeClient.addAppUserIntegralChange(appUserIntegralChange);
-			
+
 			appUser1.setPoints(appUser1.getPoints() + num1);
 			appUserClient.updateAppUser(appUser1);
 		}
 	}
-	
+
 	/**
 	 * 异常结束充电处理逻辑
 	 * @param orderCode
@@ -1546,8 +1633,142 @@
 	public void excelEndCharge(String orderCode) {
 		endCharge(orderCode, 0);
 	}
-	
-	
+
+	@Override
+	public List<Map<String, Object>> getByDate(List<Long> chargingOrderIds) {
+		return this.baseMapper.getByDate(chargingOrderIds);
+	}
+
+	@Override
+	public List<Map<String, Object>> queryPower(List<Integer> siteIds) {
+		return this.baseMapper.queryPower(siteIds);
+	}
+
+	@Override
+	public Map<String, Object> qureryPowerLevel(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.queryPowerLevel(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds) {
+		return this.baseMapper.queryOrderCountAndMoneyBySiteIdDate(siteIds);
+	}
+
+	@Override
+	public List<Map<String, Object>> usersDay() {
+		return this.baseMapper.usersDay();
+	}
+
+	@Override
+	public List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.usersByQuery(statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> getUserTagCount() {
+		return this.baseMapper.getUserTagCount();
+	}
+
+	@Override
+	public List<Map<String, Object>> getVipCount() {
+		return this.baseMapper.getVipCount();
+	}
+
+	@Override
+	public List<Map<String, Object>> unitConsumption(ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.unitConsumption(statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> carUserMethod() {
+		return this.baseMapper.carUserMethod();
+	}
+
+	@Override
+	public List<Map<String, Object>> carUserBrand() {
+		return this.baseMapper.carUserBrand();
+	}
+
+	@Override
+	public Map<String, Object> countLocalCar() {
+		return this.baseMapper.countLocalCar();
+	}
+
+	@Override
+	public Long getAver(List<Integer> siteIds) {
+		return this.baseMapper.getAver(siteIds);
+	}
+
+	@Override
+	public List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds) {
+		return this.baseMapper.getLevelEvaluate(siteIds);
+	}
+
+
+	@Override
+	public R payRefund(PayOrderRefundDto payOrderQueryDto) {
+			if (payOrderQueryDto.getType()==1){
+				TChargingOrder tChargingOrder = this.baseMapper.selectById(payOrderQueryDto.getOrderId());
+				TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
+				chargingOrderRefund.setChargingOrderId(tChargingOrder.getId());
+				chargingOrderRefund.setRefundAmount(payOrderQueryDto.getRefundAmount());
+				chargingOrderRefund.setRefundStatus(1);
+				chargingOrderRefund.setPayType(tChargingOrder.getRechargePaymentType());
+				chargingOrderRefund.setRefundTime(LocalDateTime.now());
+				chargingOrderRefund.setCode(tChargingOrder.getCode());
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+				chargingOrderRefund.setRefundCode("GDF" + sdf.format(new Date()) + (Math.random() * 1000));
+				chargingOrderRefund.setRefundTitle("后台退款");
+				chargingOrderRefund.setRefundContent("后台退款");
+				chargingOrderRefund.setRefundReason("后台退款");
+				chargingOrderRefund.setRefundRemark("后台退款");
+				chargingOrderRefund.setRefundTotalAmount(tChargingOrder.getRefundAmount().add(payOrderQueryDto.getRefundAmount()));
+				chargingOrderRefund.setPayAmount(tChargingOrder.getPaymentAmount());
+
+				if(1 == tChargingOrder.getRechargePaymentType()){
+					WxPaymentRefundModel model = new WxPaymentRefundModel();
+					model.setOut_trade_no(tChargingOrder.getCode());
+					model.setOut_refund_no(chargingOrderRefund.getRefundCode());
+					model.setTransaction_id(tChargingOrder.getRechargeSerialNumber());
+					model.setReason("取消订单");
+					model.setNotify_url("http://221.182.45.100:9000/order/t-shopping-order/cancelShoppingOrderWxRefund");
+					WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
+					amount.setRefund(payOrderQueryDto.getRefundAmount().multiply(new BigDecimal(100)).intValue());
+					amount.setTotal(tChargingOrder.getPaymentAmount().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 == tChargingOrder.getRechargePaymentType()){
+					RefundReq dto = new RefundReq();
+					dto.setOutTradeNo(tChargingOrder.getCode());
+					dto.setOutRequestNo(tChargingOrder.getCode());
+					dto.setRefundAmount(payOrderQueryDto.getRefundAmount().toString());
+					dto.setRefundReason("取消订单");
+					RefundResp resp = aliPaymentClient.refund(dto).getData();
+					if(null != resp){
+						SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-DDTHH:mm:ss+TIMEZONE");
+							chargingOrderRefundService.save(chargingOrderRefund);
+
+					}
+				}
+
+
+
+
+
+			}
+
+
+
+		return null;
+	}
+
+
 	/**
 	 * 根据车牌号和开始时间查询充电数据
 	 * @param query
@@ -1564,4 +1785,329 @@
 				.eq(TChargingOrder::getRechargePaymentStatus, 2).ne(TChargingOrder::getStatus, -1));
 		return one;
 	}
+
+	@Override
+	public TSettlementConfirm settlementAdd(SettlementConfirmAdd dto) {
+		List<Site> data = siteClient.getSiteByIds(Arrays.asList(dto.getSiteId())).getData();
+		TSettlementConfirm tSettlementConfirm = new TSettlementConfirm();
+		if (!data.isEmpty()){
+			tSettlementConfirm.setSiteName(data.get(0).getName());
+			tSettlementConfirm.setPartnerId(data.get(0).getPartnerId());
+			if (data.get(0).getPartnerId()!=null){
+				Partner data1 = siteClient.getPartnerR(data.get(0).getPartnerId()).getData();
+				if (data1!=null){
+					tSettlementConfirm.setPartnerName(data1.getName());
+					tSettlementConfirm.setPartnerId(data1.getId());
+				}
+			}
+		}
+		String startTime = dto.getStartTime();
+		String endTime = dto.getEndTime();
+		// 将这两个时间转化为localDateTime
+		tSettlementConfirm.setStartTime(LocalDateTime.parse(startTime));
+		tSettlementConfirm.setEndTime(LocalDateTime.parse(endTime));
+		// 根据站点id和开始时间和结束时间和归属日期 查询充电订单列表
+		QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
+				.eq("site_id", dto.getSiteId())
+				.eq("recharge_payment_status",2);
+		switch (dto.getType()){
+			case 1:
+				eq.between("start_time", startTime, endTime);
+				break;
+			case 2:
+				eq.between("end_time", startTime, endTime);
+				break;
+		}
+		List<TChargingOrder> tChargingOrders = this.baseMapper.selectList(eq);
+		// 充电电量 度
+		BigDecimal chargingElectronic = new BigDecimal("0");
+		// 三方收费 分佣
+		BigDecimal sharingAmount = new BigDecimal("0");
+		// 三方交易手续费 三方收费*0.6%
+		BigDecimal commissionAmount = new BigDecimal("0");
+		// 累计电费
+		BigDecimal electrovalence = new BigDecimal("0");
+		// 累计服务费
+		BigDecimal serviceCharge = new BigDecimal("0");
+		// 订单手续费 订单支付金额*0.6%
+		BigDecimal orderCommission = new BigDecimal("0");
+		// 会员抵扣
+		BigDecimal vipDiscount = new BigDecimal("0");
+		// 优惠券抵扣
+		BigDecimal couponDiscount = new BigDecimal("0");
+		// 支付订单金额 需要减去退款金额
+		BigDecimal paymentAmount = new BigDecimal("0");
+		for (TChargingOrder tChargingOrder : tChargingOrders) {
+			// 累加充电总度数
+			chargingElectronic = chargingElectronic.add(tChargingOrder.getChargingCapacity());
+			// 累加分佣
+			sharingAmount = sharingAmount.add(tChargingOrder.getSharingAmount());
+			// 累加电费
+			electrovalence = electrovalence.add(tChargingOrder.getElectrovalence());
+			// 累加服务费
+			serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
+			// 累加会员折扣
+			if (tChargingOrder.getVipDiscountAmount()!=null){
+				vipDiscount = vipDiscount.add(tChargingOrder.getVipDiscountAmount());
+			}
+			// 累加优惠券折扣
+			if (tChargingOrder.getCouponDiscountAmount()!=null){
+				couponDiscount = couponDiscount.add(tChargingOrder.getCouponDiscountAmount());
+			}
+			if (tChargingOrder.getRefundStatus() == 2){
+				// 如果成功退款 那么减去退款金额
+				paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount().subtract(tChargingOrder.getRefundAmount()));
+			}else{
+				paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
+			}
+		}
+		// 三方交易手续费 三方收费*0.6%
+		commissionAmount = sharingAmount.multiply(new BigDecimal("0.006"));
+		// 订单手续费 订单支付金额 - 退款金额*0.6%
+		orderCommission = paymentAmount.multiply(new BigDecimal("0.006"));
+		tSettlementConfirm.setSharingAmount(sharingAmount);
+		tSettlementConfirm.setCommissionAmount(commissionAmount);
+		tSettlementConfirm.setElectrovalence(electrovalence);
+		// 服务费=总服务费-三费收费-交易手续费-交易手续费-服务费会员抵扣-服务费优惠券抵扣
+		tSettlementConfirm.setServiceCharge(serviceCharge.subtract(commissionAmount).subtract(sharingAmount).subtract(orderCommission).subtract(vipDiscount).subtract(couponDiscount));
+		tSettlementConfirm.setOrderCommission(orderCommission);
+		tSettlementConfirm.setVipDiscount(vipDiscount);
+		tSettlementConfirm.setCouponDiscount(couponDiscount);
+		tSettlementConfirm.setSiteId(dto.getSiteId());
+		tSettlementConfirm.setMeteringElectronic(dto.getData().getMeteringElectronic());
+		tSettlementConfirm.setChargingElectronic(chargingElectronic);
+		tSettlementConfirm.setLossElectronic(dto.getData().getLossElectronic());
+		tSettlementConfirm.setIncome(chargingElectronic.add(serviceCharge));
+		tSettlementConfirm.setVenue(dto.getData().getVenue());
+		tSettlementConfirm.setMetering(dto.getData().getMetering());
+		tSettlementConfirm.setClean(dto.getData().getClean());
+		tSettlementConfirm.setMaintain(dto.getData().getMaintain());
+		tSettlementConfirm.setCost(dto.getData().getVenue().add(dto.getData().getClean()).add(dto.getData().getMaintain()));
+		tSettlementConfirm.setProfitMoney(new BigDecimal("0"));
+		tSettlementConfirm.setNewMoney(new BigDecimal("0"));
+		tSettlementConfirm.setNewSettlement(new BigDecimal("0"));
+		tSettlementConfirm.setVipDiscount(vipDiscount);
+		tSettlementConfirm.setCouponDiscount(couponDiscount);
+		tSettlementConfirm.setSupplyElectronic(dto.getData().getSupplyElectronic());
+		tSettlementConfirm.setType(dto.getType());
+		tSettlementConfirm.setProportionPartner(dto.getData().getProportionPartner());
+		tSettlementConfirm.setProportionMoney(dto.getData().getProportionMoney());
+		tSettlementConfirm.setTotalElectronic(dto.getData().getTotalElectronic());
+		tSettlementConfirm.setTotalService(dto.getData().getTotalService());
+		tSettlementConfirm.setRemark(dto.getData().getRemark());
+		tSettlementConfirm.setServicePartner(dto.getData().getServicePartner());
+		tSettlementConfirm.setServiceMoney(dto.getData().getServiceMoney());
+		tSettlementConfirm.setTotalService(dto.getData().getTotalService());
+		tSettlementConfirm.setServiceRemark(dto.getData().getServiceRemark());
+		tSettlementConfirm.setDistribution(dto.getData().getDistribution());
+		tSettlementConfirm.setIncome(dto.getData().getElectrovalence().add(dto.getData().getServiceCharge()));
+		if (dto.getState() == 2){
+			tSettlementConfirmMapper.insert(tSettlementConfirm);
+		}
+		return tSettlementConfirm;
+	}
+
+	@Override
+	public PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto) {
+		PageInfo<TSettlementConfirm> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
+		List<TSettlementConfirm> list = tSettlementConfirmMapper.settlementList(pageInfo,dto);
+		for (TSettlementConfirm tSettlementConfirm : list) {
+			tSettlementConfirm.setUid(tSettlementConfirm.getId().toString());
+			Partner data = siteClient.getPartnerR(tSettlementConfirm.getPartnerId()).getData();
+			List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(tSettlementConfirm.getSiteId())).getData();
+			if (!data1.isEmpty()){
+				tSettlementConfirm.setSiteName(data1.get(0).getName());
+			}
+			if (data!=null){
+				tSettlementConfirm.setPartnerName(data.getName());
+			}
+			String format = tSettlementConfirm.getStartTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss"));
+			String format1 = tSettlementConfirm.getEndTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss"));
+			tSettlementConfirm.setTime(format+"至"+format1);
+
+
+		}
+		pageInfo.setRecords(list);
+		return null;
+	}
+
+	@Override
+	public SettlementTotalVO settlementTotal(String time) {
+		SettlementTotalVO res = new SettlementTotalVO();
+		List<TSettlementConfirm> list1 = tSettlementConfirmMapper.settlementTotal(time);
+		LocalDateTime parse = LocalDateTime.parse(time, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+		// 减少一个月
+		LocalDateTime minus = parse.minusMonths(1);
+		List<TSettlementConfirm> list2 = tSettlementConfirmMapper.settlementTotal(time);
+		// 合计
+		List<TSettlementConfirm> total = new ArrayList<>();
+
+		TSettlementConfirm tSettlementConfirm1 = new TSettlementConfirm();
+		BigDecimal meteringElectronic = new BigDecimal("0");
+		BigDecimal chargingElectronic = new BigDecimal("0");
+		BigDecimal lossElectronic = new BigDecimal("0");
+		BigDecimal income = new BigDecimal("0");
+		BigDecimal venue = new BigDecimal("0");
+		BigDecimal metering = new BigDecimal("0");
+		BigDecimal clean = new BigDecimal("0");
+		BigDecimal maintain = new BigDecimal("0");
+		BigDecimal cost = new BigDecimal("0");
+		BigDecimal profitMoney = new BigDecimal("0");
+		BigDecimal newMoney = new BigDecimal("0");
+		BigDecimal newSettlement = new BigDecimal("0");
+		BigDecimal supplyElectronic = new BigDecimal("0");
+		BigDecimal proportionPartner = new BigDecimal("0");
+		BigDecimal proportionMoney = new BigDecimal("0");
+		BigDecimal totalElectronic = new BigDecimal("0");
+		BigDecimal totalService = new BigDecimal("0");
+		BigDecimal servicePartner = new BigDecimal("0");
+		BigDecimal serviceMoney = new BigDecimal("0");
+		BigDecimal sharingAmount = new BigDecimal("0");
+		BigDecimal commissionAmount = new BigDecimal("0");
+		BigDecimal electrovalence = new BigDecimal("0");
+		BigDecimal serviceCharge = new BigDecimal("0");
+		BigDecimal orderCommission = new BigDecimal("0");
+		BigDecimal vipDiscount = new BigDecimal("0");
+		BigDecimal couponDiscount = new BigDecimal("0");
+//		tSettlementConfirm1.setIncomePercentage();
+//		tSettlementConfirm1.setTotalPercentage();
+		tSettlementConfirm1.setElectronicRefund(0);
+// 上月成本合计
+		BigDecimal beforeCost= new BigDecimal("0");
+		// 上月利润合计
+		BigDecimal beforeIncome= new BigDecimal("0");
+		for (TSettlementConfirm tSettlementConfirm : list1) {
+			List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(tSettlementConfirm.getSiteId())).getData();
+			if (!data1.isEmpty()){
+				tSettlementConfirm.setSiteName(data1.get(0).getName());
+			}
+			meteringElectronic = meteringElectronic.add(tSettlementConfirm.getMeteringElectronic());
+			chargingElectronic = chargingElectronic.add(tSettlementConfirm.getChargingElectronic());
+			lossElectronic = lossElectronic.add(tSettlementConfirm.getLossElectronic());
+			income = income.add(tSettlementConfirm.getIncome());
+			venue = venue.add(tSettlementConfirm.getVenue());
+			metering = metering.add(tSettlementConfirm.getMetering());
+			clean = clean.add(tSettlementConfirm.getClean());
+			maintain = maintain.add(tSettlementConfirm.getMaintain());
+			cost = cost.add(tSettlementConfirm.getCost());
+			profitMoney = profitMoney.add(tSettlementConfirm.getProfitMoney());
+			newMoney = newMoney.add(tSettlementConfirm.getNewMoney());
+			newSettlement = newSettlement.add(tSettlementConfirm.getNewSettlement());
+			supplyElectronic = supplyElectronic.add(tSettlementConfirm.getSupplyElectronic());
+			proportionPartner = proportionPartner.add(tSettlementConfirm.getProportionPartner());
+			proportionMoney = proportionMoney.add(tSettlementConfirm.getProportionMoney());
+			totalElectronic = totalElectronic.add(tSettlementConfirm.getTotalElectronic());
+			totalService = totalService.add(tSettlementConfirm.getTotalService());
+			servicePartner = servicePartner.add(tSettlementConfirm.getServicePartner());
+			serviceMoney = serviceMoney.add(tSettlementConfirm.getServiceMoney());
+			sharingAmount = sharingAmount.add(tSettlementConfirm.getSharingAmount());
+			commissionAmount = commissionAmount.add(tSettlementConfirm.getCommissionAmount());
+			electrovalence = electrovalence.add(tSettlementConfirm.getElectrovalence());
+			serviceCharge = serviceCharge.add(tSettlementConfirm.getServiceCharge());
+			orderCommission = orderCommission.add(tSettlementConfirm.getOrderCommission());
+			vipDiscount = vipDiscount.add(tSettlementConfirm.getVipDiscount());
+			couponDiscount = couponDiscount.add(tSettlementConfirm.getCouponDiscount());
+
+			// 查询结算确认单开始时间和结束时间的单子
+			QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
+					.eq("site_id", tSettlementConfirm.getSiteId())
+					.eq("recharge_payment_status",2);
+			switch (tSettlementConfirm.getType()){
+				case 1:
+					eq.between("start_time", tSettlementConfirm.getStartTime(), tSettlementConfirm.getEndTime());
+					break;
+				case 2:
+					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(",");
+			}
+			Long temp = 0L;
+			if (StringUtils.hasLength(stringBuilder.toString())){
+				List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getOrderInfoByCodes(stringBuilder.substring(0,stringBuilder.length()-1)).getData();
+				temp+=data6.stream().mapToLong(UploadRealTimeMonitoringData::getCumulative_charging_time).sum();
+			}
+			List<TChargingPile> data = siteClient.getPileListBySiteId(tSettlementConfirm.getSiteId()).getData();
+			// 计算充电桩的功率平均值
+			BigDecimal bigDecimal = new BigDecimal("0");
+			for (TChargingPile datum : data) {
+				bigDecimal = bigDecimal.add(datum.getRatedPower());
+			}
+			BigDecimal bigDecimal1 = bigDecimal.divide(new BigDecimal(data.size())).setScale(2, RoundingMode.HALF_DOWN);
+
+			tSettlementConfirm.setIncome(tSettlementConfirm.getElectrovalence().add(tSettlementConfirm.getServiceCharge()));
+			// todo 计算利用率 该电站充电桩本月利用率：
+			//利用率=充电量/（桩数量*功率*时间）
+
+			for (TSettlementConfirm settlementConfirm : list2) {
+				settlementConfirm.setIncome(settlementConfirm.getElectrovalence().add(settlementConfirm.getServiceCharge()));
+				if (tSettlementConfirm.getSiteId().equals(settlementConfirm.getSiteId())){
+					// 电站相同比较收入涨幅跌幅
+					BigDecimal subtract = tSettlementConfirm.getIncome().subtract(settlementConfirm.getIncome()).divide(tSettlementConfirm.getIncome()).setScale(2, RoundingMode.HALF_DOWN).multiply(new BigDecimal("100"));
+					tSettlementConfirm.setIncomePercentage(subtract+"%");
+					// 比较总利润 收入合计-成本合计
+					BigDecimal subtract1 = tSettlementConfirm.getIncome().subtract(tSettlementConfirm.getCost());
+					BigDecimal subtract2 = settlementConfirm.getIncome().subtract(settlementConfirm.getCost());
+					tSettlementConfirm.setTotalPercentage(subtract1.subtract(subtract2).divide(subtract2).setScale(2, RoundingMode.HALF_DOWN).multiply(new BigDecimal("100"))+"%");
+				}
+				beforeCost = beforeCost.add(settlementConfirm.getCost());
+				beforeIncome = beforeIncome.add(settlementConfirm.getIncome());
+
+
+			}
+		}
+		TSettlementConfirm tSettlementConfirm = new TSettlementConfirm();
+		tSettlementConfirm.setMeteringElectronic(meteringElectronic);
+		tSettlementConfirm.setChargingElectronic(chargingElectronic);
+		tSettlementConfirm.setLossElectronic(lossElectronic);
+		tSettlementConfirm.setIncome(income);
+		tSettlementConfirm.setVenue(venue);
+		tSettlementConfirm.setMetering(metering);
+		tSettlementConfirm.setClean(clean);
+		tSettlementConfirm.setMaintain(maintain);
+		tSettlementConfirm.setCost(cost);
+		tSettlementConfirm.setProfitMoney(profitMoney);
+		tSettlementConfirm.setNewMoney(newMoney);
+		tSettlementConfirm.setNewSettlement(newSettlement);
+		tSettlementConfirm.setSupplyElectronic(supplyElectronic);
+		tSettlementConfirm.setProportionPartner(proportionPartner);
+		tSettlementConfirm.setProportionMoney(proportionMoney);
+		tSettlementConfirm.setTotalElectronic(totalElectronic);
+		tSettlementConfirm.setTotalService(totalService);
+		tSettlementConfirm.setServicePartner(servicePartner);
+		tSettlementConfirm.setServiceMoney(serviceMoney);
+		tSettlementConfirm.setSharingAmount(sharingAmount);
+		tSettlementConfirm.setCommissionAmount(commissionAmount);
+		tSettlementConfirm.setElectrovalence(electrovalence);
+		tSettlementConfirm.setServiceCharge(serviceCharge);
+		tSettlementConfirm.setOrderCommission(orderCommission);
+		tSettlementConfirm.setVipDiscount(vipDiscount);
+		tSettlementConfirm.setCouponDiscount(couponDiscount);
+		// 本月
+		BigDecimal subtract = income.subtract(beforeIncome).divide(beforeIncome).setScale(2, RoundingMode.HALF_DOWN).multiply(new BigDecimal("100"));
+		tSettlementConfirm.setIncomePercentage(subtract+"%");
+		// 比较总利润 收入合计-成本合计
+		BigDecimal subtract1 = income.subtract(cost);
+		BigDecimal subtract2 = beforeIncome.subtract(beforeCost);
+		tSettlementConfirm.setTotalPercentage(subtract1.subtract(subtract2).divide(subtract2).setScale(2, RoundingMode.HALF_DOWN).multiply(new BigDecimal("100"))+"%");
+		tSettlementConfirm.setIncomePercentage(subtract+"%");
+		tSettlementConfirm.setElectronicRefund(0);
+		// 查询上次汇报数据 进行比对涨幅跌幅
+		total.add(tSettlementConfirm);
+		res.setList1(list1);
+		res.setList2(total);
+		return res;
+	}
+
+	public static void main(String[] args) {
+//		String format = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss"));
+//		String format1 = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss"));
+//		System.err.println(format+"至"+format1);
+//		LocalDateTime parse = LocalDateTime.parse("2024-01-12 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//		System.err.println(parse.format(DateTimeFormatter.ofPattern("yyyy-dd")));
+	}
 }

--
Gitblit v1.7.1