From 8c03ae07df6e094ab3420017d76bcd9ad0a8dac0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 27 九月 2024 10:44:31 +0800
Subject: [PATCH] 合併代碼

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 1245 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 1,057 insertions(+), 188 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..7d09d3d 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,30 +31,34 @@
 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.AccountingStrategyOrderClient;
 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.other.api.domain.*;
 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.RoleSiteClient;
-import com.ruoyi.other.api.feignClient.UserSiteClient;
+import com.ruoyi.other.api.feignClient.*;
 import com.ruoyi.payment.api.feignClient.AliPaymentClient;
 import com.ruoyi.payment.api.feignClient.WxPaymentClient;
 import com.ruoyi.payment.api.model.RefundReq;
 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;
@@ -63,6 +66,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
@@ -74,7 +78,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 +94,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 +111,6 @@
 
 	@Resource
 	private ChargingPileClient chargingPileClient;
-
 
 	@Resource
 	private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;
@@ -118,7 +123,6 @@
 	
 	@Resource
 	private AliPaymentClient aliPaymentClient;
-	
 
 	@Resource
 	private AppCouponClient appCouponClient;
@@ -141,45 +145,57 @@
 	@Resource
 	private TOrderEvaluateService orderEvaluateService;
 
-	
+
 	@Resource
 	private AccountingStrategyDetailClient accountingStrategyDetailClient;
-	
+
 	@Resource
 	private AccountingStrategyDetailOrderClient accountingStrategyDetailOrderClient;
 	
 	@Resource
+	private AccountingStrategyOrderClient accountingStrategyOrderClient;
+
+	@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;
 	
+	@Resource
+	private VipClient vipClient;
+	
+	@Resource
+	private UserTagClient userTagClient;
+	
+	@Resource
+	private AppUserTagClient appUserTagClient;
+
 	//计数器
 	private Map<String, Integer> counter_map = new HashMap<>();
-	
-	
-	
+
+
+
 
 	/**
 	 * 获取小程序充电记录列表数据
@@ -410,7 +426,7 @@
 		//构建新的待支付订单
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
 		TChargingOrder chargingOrder = new TChargingOrder();
-		String code = "CD" + Math.random() * 1000 + sdf.format(new Date());
+		String code = "CD" + Double.valueOf(Math.random() * 1000).intValue() + sdf.format(new Date());
 		chargingOrder.setCode(code);
 		chargingOrder.setOrderType(1);
 		chargingOrder.setOrderClassification(1);
@@ -424,7 +440,28 @@
 		chargingOrder.setRechargePaymentStatus(1);
 		chargingOrder.setRechargeAmount(addChargingOrder.getPaymentAmount());
 		chargingOrder.setAppCouponId(addChargingOrder.getAppUserCouponId());
-		if(null != appUser.getVipId()){
+		chargingOrder.setVipDiscount(new BigDecimal(10));
+		chargingOrder.setVipDiscountAmount(BigDecimal.ZERO);
+		
+		Site site = siteClient.getSiteByIds(Arrays.asList(tChargingGun.getSiteId())).getData().get(0);
+		Integer accountingStrategyId = tChargingGun.getAccountingStrategyId();
+		if(null == accountingStrategyId){
+			//查询站点上面的计费策略
+			accountingStrategyId = site.getAccountingStrategyId();
+		}
+		TAccountingStrategy accountingStrategy = accountingStrategyClient.getAccountingStrategyById(accountingStrategyId).getData();
+		
+		//直营站点才可以享受会员折扣
+		if(null != appUser.getVipId() && 1 == site.getBusinessCategory()){
+			TVip vip = vipClient.getInfo(appUser.getVipId()).getData();
+			BigDecimal discount = null;
+			if(1 == vip.getType()){
+				//普通会员折扣使用积分策略上的折扣,且有最高优惠金额
+				discount = accountingStrategy.getDiscount();
+			}else{
+				//内部会员使用会员信息设置的折扣,没有最高优惠金额
+				discount = vip.getDiscount();
+			}
 			GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
 			getAppUserVipDetail.setAppUserId(appUser.getId());
 			getAppUserVipDetail.setVipId(appUser.getVipId());
@@ -432,18 +469,14 @@
 			if(null != vipDetail){
 				Integer chargeNum = vipDetail.getChargeNum();
 				if(0 > chargeNum){
-					chargingOrder.setVipDiscount(vipDetail.getDiscount());
-					BigDecimal discountAmount = addChargingOrder.getPaymentAmount().multiply((new BigDecimal(10)
-							.subtract(vipDetail.getDiscount())).divide(new BigDecimal(10))).setScale(4, BigDecimal.ROUND_HALF_EVEN);
-					chargingOrder.setVipDiscountAmount(discountAmount);
+					chargingOrder.setVipDiscount(discount);
 				}
 			}
 		}
 		this.save(chargingOrder);
-		
+
 		//添加订单的计费策略
-		TAccountingStrategy accountingStrategy = accountingStrategyClient.getAccountingStrategyById(tChargingGun.getAccountingStrategyId()).getData();
-		List<TAccountingStrategyDetail> strategyDetailList = accountingStrategyDetailClient.getListByAccountingStrategyId(tChargingGun.getAccountingStrategyId()).getData();
+		List<TAccountingStrategyDetail> strategyDetailList = accountingStrategyDetailClient.getListByAccountingStrategyId(accountingStrategyId).getData();
 		AccountingStrategyOrder accountingStrategyOrder = new AccountingStrategyOrder();
 		BeanUtils.copyProperties(accountingStrategy, accountingStrategyOrder);
 		accountingStrategyOrder.setChargingOrderId(chargingOrder.getId());
@@ -456,7 +489,7 @@
 			list1.add(accountingStrategyDetailOrder);
 		}
 		accountingStrategyDetailOrderService.saveBatch(list1);
-		
+
 		//会员优惠折扣将其计入增加充电时长(增加总充电金额)
 		//如果充电总金额未使用完,则需要退回费用=(原金额/总金额)*(总金额-实际充电金额)
 		if(1 == addChargingOrder.getPaymentType()){
@@ -478,7 +511,7 @@
 			req.setBody("充电充值");
 			AliPaymentResp data = aliPaymentClient.payment(req).getData();
 			if(null != data){
-				data.setNotifyUrl(data.getNotifyUrl() + "/t-charging-order/chargingOrderALICallback");
+				data.setNotifyUrl(data.getNotifyUrl() + "/order/t-charging-order/chargingOrderALICallback");
 				return AjaxResult.success(data);
 			}
 		}
@@ -504,7 +537,7 @@
 		chargingOrder.setRechargePaymentStatus(2);
 		chargingOrder.setRechargeSerialNumber(transaction_id);
 		chargingOrder.setStatus(2);
-		
+
 		//添加安全检测数据到缓存中,每步安全检测完成后需要更新缓存数据
 		PreChargeCheck preChargeCheck = new PreChargeCheck();
 		preChargeCheck.setElectronicLockLock(false);
@@ -516,45 +549,91 @@
 		
 		//根据当前充值的金额和计费模板算出充电的金额
 		BigDecimal rechargeAmount = chargingOrder.getRechargeAmount();
-		//计算充电金额,会员需要将折扣金额加入到充电总金额中
-		TChargingGun chargingGun = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
-		AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderClient.getNowAccountingStrategyDetailOrder(chargingOrder.getId()).getData();
-		//总单价
-		BigDecimal totalUnitPrice = strategyDetail.getServiceCharge().add(strategyDetail.getElectrovalence());
-		//计算能充电的度数
-		BigDecimal degrees = rechargeAmount.divide(totalUnitPrice);
+		BigDecimal rechargeAmount1 = new BigDecimal(rechargeAmount.toString());
+		Long now = System.currentTimeMillis();
+		//根据支付金额,获取出使用的计费策略明细
 		//计算电费金额和服务费
-		BigDecimal serviceCharge = strategyDetail.getServiceCharge().multiply(degrees);
-		BigDecimal electrovalence = strategyDetail.getElectrovalence().multiply(degrees);
-		
-		//再处理会员折扣
-		BigDecimal discount = BigDecimal.ZERO;
+		BigDecimal serviceCharge = BigDecimal.ZERO;
+		BigDecimal electrovalence = BigDecimal.ZERO;
+		BigDecimal discountAmount = BigDecimal.ZERO;
+		BigDecimal discount = chargingOrder.getVipDiscount();
+		//先根据额定功率计算出每秒充电度数,然后计算出支付金额能充多少度电
+		TChargingGun tChargingGun = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
+		BigDecimal s_degrees = tChargingGun.getRatedPower().divide(new BigDecimal(3600));
+
 		TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
-		if(null != appUser.getVipId()){
-			GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
-			getAppUserVipDetail.setAppUserId(chargingOrder.getAppUserId());
-			getAppUserVipDetail.setVipId(appUser.getVipId());
-			TAppUserVipDetail data = appUserVipDetailClient.getAppUserVipDetail(getAppUserVipDetail).getData();
-			if(data.getChargeNum() > 0){
-				discount = serviceCharge.multiply(data.getDiscount().divide(new BigDecimal(10)));
-				data.setChargeNum(data.getChargeNum() - 1);
-				appUserVipDetailClient.updateAppUserVipDetail(data);
+		List<AccountingStrategyDetailOrder> list = accountingStrategyDetailOrderClient.getAllAccountingStrategyDetailOrder(chargingOrder.getId()).getData();
+		for (AccountingStrategyDetailOrder accountingStrategyDetailOrder : list) {
+			AccountingStrategyOrder accountingStrategyOrder = accountingStrategyOrderClient.getAccountingStrategyOrderById(accountingStrategyDetailOrder.getAccountingStrategyOrderId()).getData();
+			Integer start = Integer.valueOf(accountingStrategyDetailOrder.getStartTime().replaceAll(":", ""));
+			String[] split = accountingStrategyDetailOrder.getEndTime().split(":");
+			if(now >= start){
+				Calendar calendar = Calendar.getInstance();
+				calendar.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
+				calendar.set(Calendar.MINUTE, Integer.valueOf(split[1]));
+				//到此策略结束的秒数
+				long m = (calendar.getTimeInMillis() - now) / 1000;
+				//每度电的单价
+				BigDecimal total_unit = accountingStrategyDetailOrder.getElectrovalence().add(accountingStrategyDetailOrder.getServiceCharge());
+				//每秒需要支付的金额
+				BigDecimal multiply = s_degrees.multiply(total_unit);
+				//计算充值金额能充多长时间的电
+				long times = rechargeAmount1.divide(multiply, 0, RoundingMode.DOWN).longValue();
+				if(times > m){
+					//充电时间跨度两个计费策略,需要继续对下一个策略进行计算
+					electrovalence = accountingStrategyDetailOrder.getElectrovalence().multiply(s_degrees).multiply(new BigDecimal(m));
+					serviceCharge = accountingStrategyDetailOrder.getServiceCharge().multiply(s_degrees).multiply(new BigDecimal(m));
+					discountAmount = discountAmount.add(serviceCharge.multiply((new BigDecimal(10).subtract(discount)).divide(new BigDecimal(10))));
+					rechargeAmount1 = rechargeAmount1.subtract(multiply.multiply(new BigDecimal(m)));
+				}else{
+					electrovalence = accountingStrategyDetailOrder.getElectrovalence().multiply(s_degrees).multiply(new BigDecimal(times));
+					serviceCharge = accountingStrategyDetailOrder.getServiceCharge().multiply(s_degrees).multiply(new BigDecimal(times));
+					discountAmount = discountAmount.add(serviceCharge.multiply((new BigDecimal(10).subtract(discount)).divide(new BigDecimal(10))));
+					break;
+				}
 			}
 		}
-		electrovalence = electrovalence.add(discount);
+		if(discountAmount.compareTo(BigDecimal.ZERO) >= 0){
+			//计算会员最大优惠金额
+			if(null != appUser.getVipId()){
+				TVip vip = vipClient.getInfo(appUser.getVipId()).getData();
+				BigDecimal maximumDeduction = vip.getMaximumDeduction();
+				//普通会员有最高优惠限制
+				if(vip.getType() == 1 && discountAmount.compareTo(maximumDeduction) > 0){
+					discountAmount = maximumDeduction;
+				}
+				
+				//判断会员是否还有充电优惠次数
+				GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
+				getAppUserVipDetail.setAppUserId(chargingOrder.getAppUserId());
+				getAppUserVipDetail.setVipId(appUser.getVipId());
+				TAppUserVipDetail data = appUserVipDetailClient.getAppUserVipDetail(getAppUserVipDetail).getData();
+				if(data.getChargeNum() > 0){
+					data.setChargeNum(data.getChargeNum() - 1);
+					appUserVipDetailClient.updateAppUserVipDetail(data);
+					//会员有充电优惠次数,直接将优惠金额加入到充电费用中增加充电时长
+					electrovalence = electrovalence.add(discountAmount);
+				}
+			}
+		}
 		chargingOrder.setChargeAmount(electrovalence);
+		chargingOrder.setVipDiscountAmount(discountAmount);
 		this.updateById(chargingOrder);
-		
-		
-		TChargingPile chargingPile = chargingPileClient.getChargingPileById(chargingGun.getChargingPileId()).getData();
+
+
+		TChargingPile chargingPile = chargingPileClient.getChargingPileById(tChargingGun.getChargingPileId()).getData();
 		//调用远程启动充电消息
 		PlatformStartCharging platformStartCharging = new PlatformStartCharging();
 		platformStartCharging.setTransaction_serial_number(chargingOrder.getCode());
 		platformStartCharging.setCharging_pile_code(chargingPile.getCode());
-		platformStartCharging.setCharging_gun_code(chargingGun.getCode());
+		platformStartCharging.setCharging_gun_code(tChargingGun.getCode());
 		//使用订单id作为逻辑卡号
 		platformStartCharging.setCard_number(chargingOrder.getId().toString());
 		platformStartCharging.setAccount_balance(electrovalence);
+
+		System.err.println("-------------------远程调起开始充电请求-------------------");
+		System.err.println(platformStartCharging.toString());
+
 		sendMessageClient.platformStartCharging(platformStartCharging);
 		//异步线程检测远程启动的应答结果。如果失败,则需要全额退款
 		String code = chargingOrder.getCode();
@@ -562,6 +641,8 @@
 		ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
 		scheduler.scheduleAtFixedRate(()->{
 			List<PlatformStartChargingReply> data = platformStartChargingReplyClient.getPlatformStartChargingReply(code).getData();
+			System.err.println("-------------------开始检查调起充电结果-------------------");
+			System.err.println(data.toString());
 			if(data.size() != 0){
 				PlatformStartChargingReply platformStartChargingReply = data.get(1);
 				Integer startup_result = platformStartChargingReply.getStartup_result();
@@ -570,7 +651,7 @@
 				PreChargeCheck preChargeCheck1 = redisService.getCacheObject(key);
 				//状态为5的时候,硬件会间隔60秒后再次检测,依然未插枪,则不启动充电
 				//因这里是间隔5秒执行检测,所以累计次数在30次以上
-				if(failure_cause == 5 && null == counter || counter < 35){
+				if(failure_cause == 5 && (null == counter || counter < 35)){
 					counter++;
 					counter_map.put(code, counter);
 					//启动失败
@@ -619,7 +700,7 @@
 			TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
 			chargingOrderRefund.setChargingOrderId(chargingOrder.getId());
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
-			chargingOrderRefund.setRefundCode("CDF" + sdf.format(new Date()) + (Math.random() * 1000));
+			chargingOrderRefund.setRefundCode("CDF" + sdf.format(new Date()) + Double.valueOf(Math.random() * 1000).intValue());
 			chargingOrderRefund.setRefundAmount(rechargeAmount);
 			chargingOrderRefund.setRefundStatus(1);
 			chargingOrderRefund.setPayType(rechargePaymentType);
@@ -636,7 +717,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("/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 +743,11 @@
 					}
 				}
 			}
-			
+
 		}
 	}
-	
-	
+
+
 	/**
 	 * 启动失败后微信退款的回调处理
 	 * @param out_refund_no
@@ -685,10 +766,10 @@
 		}
 		return AjaxResult.success();
 	}
-	
-	
-	
-	
+
+
+
+
 	/**
 	 * 获取充电中的详情
 	 * @param id
@@ -752,6 +833,64 @@
 		chargingOrder.setEndMode(1);
 		this.updateById(chargingOrder);
 		
+		//处理用户标签数据
+		List<TUserTag> data = userTagClient.getAllUserTag().getData();
+		//累计充电次数
+		long count1 = this.count(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getAppUserId, chargingOrder.getAppUserId())
+				.eq(TChargingOrder::getRechargePaymentStatus, 2).isNotNull(TChargingOrder::getPaymentAmount).eq(TChargingOrder::getDelFlag, 0));
+		List<TUserTag> userTagList1 = data.stream().filter(s -> s.getStandardCondition() == 1).collect(Collectors.toList());
+		int old_times = 0;
+		Integer userTagId = null;
+		for (TUserTag tUserTag : userTagList1) {
+			Integer times = JSON.parseObject(tUserTag.getConditions()).getInteger("times");
+			//加上本次充电
+			//获取最大值标签
+			if((count1 + 1) >= times && old_times < times){
+				userTagId = tUserTag.getId();
+				old_times = times;
+			}
+		}
+		if(null != userTagId){
+			TAppUserTag appUserTag = new TAppUserTag();
+			appUserTag.setAppUserId(chargingOrder.getAppUserId());
+			appUserTag.setUserTagId(userTagId);
+			TAppUserTag data1 = appUserTagClient.getUserTag(appUserTag).getData();
+			if(null == data1){
+				data1 = new TAppUserTag();
+				data1.setAppUserId(chargingOrder.getAppUserId());
+				data1.setUserTagId(userTagId);
+				data1.setCreateTime(LocalDateTime.now());
+				appUserTagClient.addUserTag(data1);
+			}
+		}
+		//充电评率
+		List<TUserTag> userTagList2 = data.stream().filter(s -> s.getStandardCondition() == 2).collect(Collectors.toList());
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		for (TUserTag tUserTag : userTagList2) {
+			TAppUserTag appUserTag = new TAppUserTag();
+			appUserTag.setAppUserId(chargingOrder.getAppUserId());
+			appUserTag.setUserTagId(tUserTag.getId());
+			TAppUserTag data1 = appUserTagClient.getUserTag(appUserTag).getData();
+			if(null == data1){
+				Integer day = JSON.parseObject(tUserTag.getConditions()).getInteger("day");
+				Integer times = JSON.parseObject(tUserTag.getConditions()).getInteger("times");
+				Calendar start = Calendar.getInstance();
+				start.set(Calendar.DAY_OF_YEAR, start.get(Calendar.DAY_OF_YEAR) + day);
+				count1 = this.count(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getAppUserId, chargingOrder.getAppUserId())
+						.eq(TChargingOrder::getRechargePaymentStatus, 2).isNotNull(TChargingOrder::getPaymentAmount)
+						.between(TChargingOrder::getStartTime, sdf.format(start.getTime()), sdf.format(new Date())).eq(TChargingOrder::getDelFlag, 0));
+				//加上本次充电
+				if(count1 >= times){
+					data1 = new TAppUserTag();
+					data1.setAppUserId(chargingOrder.getAppUserId());
+					data1.setUserTagId(tUserTag.getId());
+					data1.setCreateTime(LocalDateTime.now());
+					appUserTagClient.addUserTag(data1);
+				}
+			}
+		}
+		
+		
 		//异步线程处理停机
 		ExecutorService cachedThreadPool = Executors.newFixedThreadPool(1);
 		cachedThreadPool.execute(()->{
@@ -776,7 +915,7 @@
 					}
 					continue;
 				}
-				
+
 				if(0 == reply.getStop_result()){
 					String failure_cause = "";
 					switch (reply.getFailure_cause()){
@@ -796,14 +935,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())
@@ -813,13 +952,24 @@
 			String inviteUsersToEarnPoints = integralRule.getInviteUsersToEarnPoints();
 			JSONObject jsonObject = JSON.parseObject(inviteUsersToEarnPoints);
 			Integer num1 = jsonObject.getInteger("num1");
+			
+			TAppUser appUser1 = appUserClient.getUserById(appUser.getInviteUserId()).getData();
+			if(null != appUser1.getVipId()){
+				TVip vip = vipClient.getInfo(appUser1.getVipId()).getData();
+				Integer doubleIntegration = vip.getDoubleIntegration();
+				//双倍积分
+				if(1 == doubleIntegration){
+					num1 *= 2;
+				}
+			}
+			
 			GetInviteUser query = new GetInviteUser();
-			query.setAppUserId(appUser.getInviteUserId());
+			query.setAppUserId(appUser1.getId());
 			query.setBeInvitedAppUserId(chargingOrder.getAppUserId());
 			TInviteUser inviteUser = inviteUserClient.getInviteUser(query).getData();
 			if(null == inviteUser){
 				inviteUser = new TInviteUser();
-				inviteUser.setAppUserId(appUser.getInviteUserId());
+				inviteUser.setAppUserId(appUser1.getId());
 				inviteUser.setBeInvitedAppUserId(chargingOrder.getAppUserId());
 				inviteUser.setAward(num1);
 				inviteUser.setCreateTime(LocalDateTime.now());
@@ -828,25 +978,24 @@
 				inviteUser.setAward(num1);
 				inviteUserClient.updateInviteUser(inviteUser);
 			}
-			TAppUser appUser1 = appUserClient.getUserById(appUser.getInviteUserId()).getData();
 			TAppUserIntegralChange appUserIntegralChange = new TAppUserIntegralChange();
-			String code = Math.random() * 1000 + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
+			String code = Double.valueOf(Math.random() * 1000).intValue() + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
 			appUserIntegralChange.setCode(code);
-			appUserIntegralChange.setAppUserId(appUser.getInviteUserId());
+			appUserIntegralChange.setAppUserId(appUser1.getId());
 			appUserIntegralChange.setChangeType(5);
 			appUserIntegralChange.setHistoricalIntegral(appUser1.getPoints());
 			appUserIntegralChange.setCurrentIntegral(appUser1.getPoints() + num1);
 			appUserIntegralChange.setCreateTime(LocalDateTime.now());
 			appUserIntegralChangeClient.addAppUserIntegralChange(appUserIntegralChange);
-			
+
 			appUser1.setPoints(appUser1.getPoints() + num1);
 			appUserClient.updateAppUser(appUser1);
 		}
-		
+
 		return AjaxResult.success();
 	}
-	
-	
+
+
 	/**
 	 * 手动结束后的费用计算和退款逻辑
 	 */
@@ -873,13 +1022,39 @@
 			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);
+		
+		//添加积分
+		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 = payAmount.multiply(new BigDecimal(num1)).intValue();
+			if(null != appUser.getVipId()){
+				TVip vip = vipClient.getInfo(appUser.getVipId()).getData();
+				Integer doubleIntegration = vip.getDoubleIntegration();
+				//双倍积分
+				if(1 == doubleIntegration){
+					integral *= 2;
+				}
+			}
+			
+			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());
+			appUserClient.updateAppUser(appUser);
+			appUserIntegralChangeClient.addAppUserIntegralChange(appUserIntegralChange);
+		}
 		
 		//计算优惠券
 		if(null != chargingOrder.getAppCouponId()){
@@ -916,7 +1091,7 @@
 				}
 			}
 		}
-		
+
 		if(null != chargingOrder.getVipDiscount()){
 			BigDecimal subtract = orderAmount.subtract(total);
 			chargingOrder.setVipDiscountAmount(subtract);
@@ -929,7 +1104,7 @@
 			TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
 			chargingOrderRefund.setChargingOrderId(chargingOrder.getId());
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
-			chargingOrderRefund.setRefundCode("CDF" + sdf.format(new Date()) + (Math.random() * 1000));
+			chargingOrderRefund.setRefundCode("CDF" + sdf.format(new Date()) + (Double.valueOf(Math.random() * 1000).intValue()));
 			chargingOrderRefund.setRefundAmount(refundAmount);
 			chargingOrderRefund.setRefundStatus(1);
 			chargingOrderRefund.setPayType(rechargePaymentType);
@@ -946,7 +1121,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("/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,8 +1147,9 @@
 					}
 				}
 			}
-			
+
 		}
+
 		
 	}
 
@@ -1117,32 +1293,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 +1352,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 +1368,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 +1417,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 +1461,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 +1504,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 +1626,7 @@
 		chargingOrderListInfoVO.setList1(list);
 		return chargingOrderListInfoVO;
 	}
+
 
 	/**
 	 * 处理充电订单实时监控数据相关的业务逻辑
@@ -1463,7 +1712,7 @@
 					chargingOrderAccountingStrategyService.save(chargingOrderAccountingStrategy1);
 				}
 			}
-			
+
 			List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.list(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>()
 					.eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId()));
 			BigDecimal t = BigDecimal.ZERO;
@@ -1477,8 +1726,8 @@
 			this.updateById(chargingOrder);
 		}
 	}
-	
-	
+
+
 	/**
 	 * 自动结束充电后的处理逻辑
 	 * @param orderCode
@@ -1494,10 +1743,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())
@@ -1507,13 +1756,24 @@
 			String inviteUsersToEarnPoints = integralRule.getInviteUsersToEarnPoints();
 			JSONObject jsonObject = JSON.parseObject(inviteUsersToEarnPoints);
 			Integer num1 = jsonObject.getInteger("num1");
+			
+			TAppUser appUser1 = appUserClient.getUserById(appUser.getInviteUserId()).getData();
+			if(null != appUser1.getVipId()){
+				TVip vip = vipClient.getInfo(appUser1.getVipId()).getData();
+				Integer doubleIntegration = vip.getDoubleIntegration();
+				//双倍积分
+				if(1 == doubleIntegration){
+					num1 *= 2;
+				}
+			}
+			
 			GetInviteUser query = new GetInviteUser();
-			query.setAppUserId(appUser.getInviteUserId());
+			query.setAppUserId(appUser1.getId());
 			query.setBeInvitedAppUserId(chargingOrder.getAppUserId());
 			TInviteUser inviteUser = inviteUserClient.getInviteUser(query).getData();
 			if(null == inviteUser){
 				inviteUser = new TInviteUser();
-				inviteUser.setAppUserId(appUser.getInviteUserId());
+				inviteUser.setAppUserId(appUser1.getId());
 				inviteUser.setBeInvitedAppUserId(chargingOrder.getAppUserId());
 				inviteUser.setAward(num1);
 				inviteUser.setCreateTime(LocalDateTime.now());
@@ -1522,11 +1782,10 @@
 				inviteUser.setAward(num1);
 				inviteUserClient.updateInviteUser(inviteUser);
 			}
-			TAppUser appUser1 = appUserClient.getUserById(appUser.getInviteUserId()).getData();
 			TAppUserIntegralChange appUserIntegralChange = new TAppUserIntegralChange();
-			String code = Math.random() * 1000 + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
+			String code = Double.valueOf(Math.random() * 1000).intValue() + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
 			appUserIntegralChange.setCode(code);
-			appUserIntegralChange.setAppUserId(appUser.getInviteUserId());
+			appUserIntegralChange.setAppUserId(appUser1.getId());
 			appUserIntegralChange.setChangeType(5);
 			appUserIntegralChange.setHistoricalIntegral(appUser1.getPoints());
 			appUserIntegralChange.setCurrentIntegral(appUser1.getPoints() + num1);
@@ -1536,8 +1795,9 @@
 			appUser1.setPoints(appUser1.getPoints() + num1);
 			appUserClient.updateAppUser(appUser1);
 		}
+		
 	}
-	
+
 	/**
 	 * 异常结束充电处理逻辑
 	 * @param orderCode
@@ -1546,8 +1806,195 @@
 	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);
+	}
+
+
+	@Resource
+	private TShoppingOrderService shoppingOrderService;
+	@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()) + (Double.valueOf(Math.random() * 1000).intValue()));
+				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("/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);
+
+					}
+				}
+
+
+
+
+
+			}
+			if (payOrderQueryDto.getType()==2){
+				TShoppingOrder tChargingOrder = shoppingOrderService.getById(payOrderQueryDto.getOrderId());
+				TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
+				chargingOrderRefund.setChargingOrderId(tChargingOrder.getId());
+				chargingOrderRefund.setRefundAmount(payOrderQueryDto.getRefundAmount());
+				chargingOrderRefund.setRefundStatus(1);
+				chargingOrderRefund.setPayType(tChargingOrder.getPaymentType());
+				chargingOrderRefund.setRefundTime(LocalDateTime.now());
+				chargingOrderRefund.setCode(tChargingOrder.getCode());
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+				chargingOrderRefund.setRefundCode("GDF" + sdf.format(new Date()) + (Double.valueOf(Math.random() * 1000).intValue()));
+				chargingOrderRefund.setRefundTitle("后台退款");
+				chargingOrderRefund.setRefundContent("后台退款");
+				chargingOrderRefund.setRefundReason("后台退款");
+				chargingOrderRefund.setRefundRemark("后台退款");
+				chargingOrderRefund.setRefundTotalAmount(tChargingOrder.getRefundAmount().add(payOrderQueryDto.getRefundAmount()));
+				chargingOrderRefund.setPayAmount(tChargingOrder.getPaymentAmount());
+
+				if(1 == tChargingOrder.getPaymentType()){
+					WxPaymentRefundModel model = new WxPaymentRefundModel();
+					model.setOut_trade_no(tChargingOrder.getCode());
+					model.setOut_refund_no(chargingOrderRefund.getRefundCode());
+					model.setTransaction_id(tChargingOrder.getSerialNumber());
+					model.setReason("取消订单");
+					model.setNotify_url("/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.getPaymentType()){
+					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 R.ok();
+	}
+
+
 	/**
 	 * 根据车牌号和开始时间查询充电数据
 	 * @param query
@@ -1564,4 +2011,426 @@
 				.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
+		// 创建 DateTimeFormatter 对象,指定格式
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日 HH:mm:ss");
+
+		// 将字符串解析为 LocalDateTime 对象
+		LocalDateTime localDateTime = LocalDateTime.parse(startTime, formatter);
+		LocalDateTime localDateTime1 = LocalDateTime.parse(endTime, formatter);
+		tSettlementConfirm.setEndTime(localDateTime1);
+		tSettlementConfirm.setStartTime(localDateTime);
+
+		// 根据站点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", localDateTime, localDateTime1);
+				break;
+			case 2:
+				eq.between("end_time", localDateTime, localDateTime1);
+				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) {
+			// 累加充电总度数
+			if (tChargingOrder.getChargingCapacity()!=null){
+				chargingElectronic = chargingElectronic.add(tChargingOrder.getChargingCapacity());
+
+			}
+			// 累加分佣
+			if (tChargingOrder.getSharingAmount()!=null) {
+				sharingAmount = sharingAmount.add(tChargingOrder.getSharingAmount());
+			}
+			// 累加电费
+			if (tChargingOrder.getElectrovalence()!=null) {
+			electrovalence = electrovalence.add(tChargingOrder.getElectrovalence());
+			}
+			// 累加服务费
+			if (tChargingOrder.getServiceCharge()!=null){
+				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()!=null &&tChargingOrder.getRefundStatus() == 2){
+				// 如果成功退款 那么减去退款金额
+				paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount().subtract(tChargingOrder.getRefundAmount()));
+			}else{
+				if (tChargingOrder.getPaymentAmount()!=null){
+					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.setChargingElectronic(chargingElectronic);
+		tSettlementConfirm.setIncome(chargingElectronic.add(serviceCharge));
+		tSettlementConfirm.setProfitMoney(new BigDecimal("0"));
+		tSettlementConfirm.setNewMoney(new BigDecimal("0"));
+		tSettlementConfirm.setNewSettlement(new BigDecimal("0"));
+		tSettlementConfirm.setVipDiscount(vipDiscount);
+		tSettlementConfirm.setCouponDiscount(couponDiscount);
+		tSettlementConfirm.setType(dto.getType());
+
+		if (dto.getState() == 2){
+			tSettlementConfirm.setSupplyElectronic(dto.getSupplyElectronic());
+			tSettlementConfirm.setVenue(dto.getVenue());
+			tSettlementConfirm.setMetering(dto.getMetering());
+			tSettlementConfirm.setClean(dto.getClean());
+			tSettlementConfirm.setLossElectronic(dto.getMeteringElectronic().subtract(dto.getChargingElectronic()));
+			tSettlementConfirm.setMaintain(dto.getMaintain());
+
+			tSettlementConfirm.setMeteringElectronic(dto.getMeteringElectronic());
+			tSettlementConfirm.setProportionPartner(dto.getProportionPartner());
+			tSettlementConfirm.setProportionMoney(dto.getProportionMoney());
+			tSettlementConfirm.setTotalElectronic(dto.getTotalElectronic());
+			tSettlementConfirm.setTotalService(dto.getTotalService());
+			tSettlementConfirm.setRemark(dto.getRemark());
+			tSettlementConfirm.setServicePartner(dto.getServicePartner());
+			tSettlementConfirm.setServiceMoney(dto.getServiceMoney());
+			tSettlementConfirm.setTotalService(dto.getTotalService());
+			tSettlementConfirm.setServiceRemark(dto.getServiceRemark());
+			tSettlementConfirm.setDistribution(dto.getDistribution());
+			tSettlementConfirm.setIncome(dto.getElectrovalence().add(dto.getServiceCharge()));
+			tSettlementConfirm.setCost(dto.getVenue().add(dto.getClean()).add(dto.getMaintain()));
+			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());
+			List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(tSettlementConfirm.getSiteId())).getData();
+			if (!data1.isEmpty()){
+				tSettlementConfirm.setSiteName(data1.get(0).getName());
+				Partner data = siteClient.getPartnerR(data1.get(0).getPartnerId()).getData();
+				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 pageInfo;
+	}
+
+	@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());
+			}
+
+
+			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);
+		// 本月
+		if (beforeIncome.compareTo(new BigDecimal("0")) == 0){
+			tSettlementConfirm.setIncomePercentage(0+"%");
+			tSettlementConfirm.setIncomePercentage(0+"%");
+		}else{
+			BigDecimal subtract = income.subtract(beforeIncome).divide(beforeIncome).setScale(2, RoundingMode.HALF_DOWN).multiply(new BigDecimal("100"));
+			tSettlementConfirm.setIncomePercentage(subtract+"%");
+			tSettlementConfirm.setIncomePercentage(subtract+"%");
+
+		}
+		// 比较总利润 收入合计-成本合计
+		BigDecimal subtract1 = income.subtract(cost);
+		BigDecimal subtract2 = beforeIncome.subtract(beforeCost);
+		if (subtract2.compareTo(new BigDecimal("0")) == 0){
+			tSettlementConfirm.setTotalPercentage(0+"%");
+		}else{
+			tSettlementConfirm.setTotalPercentage(subtract1.subtract(subtract2).divide(subtract2).setScale(2, RoundingMode.HALF_DOWN).multiply(new BigDecimal("100"))+"%");
+		}
+		tSettlementConfirm.setElectronicRefund(0);
+		// 查询上次汇报数据 进行比对涨幅跌幅
+		total.add(tSettlementConfirm);
+		res.setList1(list1);
+		res.setList2(total);
+		return res;
+	}
+
+	@Override
+	public List<Map<String, Object>> countBySource(List<Integer> siteIds) {
+		return this.baseMapper.countBySource(siteIds);
+	}
+
+	@Override
+	public List<Map<String, Object>> equipmentUserType1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.equipmentUserType1(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> equipmentUserType2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.equipmentUserType2(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> equipmentMapbroke1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.equipmentMapbroke1(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> equipmentMapbroke2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.equipmentMapbroke2(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> equipmentMapOut1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.equipmentMapOut1(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> equipmentMapOut2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.equipmentMapOut2(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> needElec(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.needElec(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> getHourType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto) {
+		return this.baseMapper.getHourType(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> getDateType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto) {
+		return this.baseMapper.getDateType(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> getMonthType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto) {
+		return this.baseMapper.getMonthType(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> getchargingCapacity(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto) {
+		return this.baseMapper.getchargingCapacity(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> countAllUserData() {
+		return this.baseMapper.countAllUserData();
+	}
+
+	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