From 67d06a785d5fc4524639ace27651c01ff05a4b58 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 29 五月 2025 22:31:33 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 2016 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 1,541 insertions(+), 475 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 4eec6ac..95be317 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
@@ -9,6 +9,7 @@
import com.ruoyi.account.api.model.*;
import com.ruoyi.account.api.vo.GetAppUserVipDetail;
import com.ruoyi.account.api.vo.GetInviteUser;
+import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
import com.ruoyi.chargingPile.api.feignClient.*;
import com.ruoyi.chargingPile.api.model.*;
import com.ruoyi.chargingPile.api.vo.GetChargingGunByCode;
@@ -16,9 +17,11 @@
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.domain.BasePojo;
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;
@@ -30,6 +33,7 @@
import com.ruoyi.integration.api.feignClient.*;
import com.ruoyi.integration.api.model.*;
import com.ruoyi.integration.api.vo.GetPlatformStopChargingReply;
+import com.ruoyi.integration.api.vo.StartChargeResult;
import com.ruoyi.order.api.dto.SettlementConfirmAdd;
import com.ruoyi.order.api.feignClient.AccountingStrategyDetailOrderClient;
import com.ruoyi.order.api.feignClient.AccountingStrategyOrderClient;
@@ -48,6 +52,8 @@
import com.ruoyi.order.service.TOrderEvaluateService;
import com.ruoyi.order.service.*;
import com.ruoyi.order.vo.EndOfChargePageInfo;
+import com.ruoyi.order.vo.OrderCountByDate;
+import com.ruoyi.order.vo.StatisticsOfBatteryVO;
import com.ruoyi.other.api.domain.*;
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import com.ruoyi.other.api.domain.TVip;
@@ -58,10 +64,13 @@
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 io.seata.spring.annotation.GlobalTransactional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@@ -76,6 +85,7 @@
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.time.format.TextStyle;
+import java.time.temporal.ChronoUnit;
import java.time.temporal.WeekFields;
import java.util.*;
import java.util.concurrent.*;
@@ -98,7 +108,8 @@
private ChargingGunClient chargingGunClient;
@Resource
private TSettlementConfirmMapper tSettlementConfirmMapper;
-
+ @Resource
+ private PartnerClient partnerClient;
@Resource
private SiteClient siteClient;
@@ -135,7 +146,7 @@
private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
@Resource
- private ChargingHandshakeClient chargingHandshakeClient;
+ private TCECClient tcecClient;
@Resource
private SendMessageClient sendMessageClient;
@@ -196,6 +207,15 @@
//计数器
private Map<String, Integer> boot_failed_map = new HashMap<>();
+
+ @Resource
+ private OperatorClient operatorClient;
+
+ @Resource
+ private TransactionRecordClient transactionRecordClient;
+
+ @Resource
+ private ITChargingOrderSummaryDataService chargingOrderSummaryDataService;
@@ -266,6 +286,8 @@
}else{
myChargingOrderInfo.setLicensePlate("无");
}
+ }else{
+ myChargingOrderInfo.setLicensePlate(chargingOrder.getPlateNum());
}
myChargingOrderInfo.setStartTime(chargingOrder.getStartTime().atZone(ZoneId.systemDefault()).toInstant().getEpochSecond() * 1000);
myChargingOrderInfo.setEndTime(chargingOrder.getEndTime().atZone(ZoneId.systemDefault()).toInstant().getEpochSecond() * 1000);
@@ -390,7 +412,7 @@
if(null != data){
//支付失败，删除无效的订单
String tradeStatus = data.getTradeStatus();
- if(tradeStatus.equals("TRADE_CLOSED")){
+ if(null != tradeStatus && tradeStatus.equals("TRADE_CLOSED")){
this.removeById(tChargingOrder.getId());
}
}
@@ -449,6 +471,12 @@
chargingOrder.setOrderClassification(1);
chargingOrder.setAppUserId(userId);
chargingOrder.setAppUserCarId(addChargingOrder.getAppUserCarId());
+ if(null != addChargingOrder.getAppUserCarId()){
+ TAppUserCar userCar = appUserCarClient.getCarById(addChargingOrder.getAppUserCarId().toString()).getData();
+ if(null != userCar){
+ chargingOrder.setPlateNum(userCar.getLicensePlate());
+ }
+ }
TChargingGun tChargingGun = chargingGunClient.getChargingGunById(addChargingOrder.getId()).getData();
TChargingPile chargingPile = chargingPileClient.getChargingPileById(tChargingGun.getChargingPileId()).getData();
chargingOrder.setSiteId(tChargingGun.getSiteId());
@@ -459,7 +487,7 @@
chargingOrder.setRechargeAmount(addChargingOrder.getPaymentAmount());
chargingOrder.setAppCouponId(addChargingOrder.getAppUserCouponId());
chargingOrder.setVipDiscountAmount(BigDecimal.ZERO);
- chargingOrder.setOrderSource(0);
+ chargingOrder.setOrderSource(1);
chargingOrder.setTitle("【充电桩充电】" + chargingPile.getNumber() + "号桩/" + tChargingGun.getCode() + "号枪");
Site site = siteClient.getSiteByIds(Arrays.asList(tChargingGun.getSiteId())).getData().get(0);
@@ -528,9 +556,9 @@
req.setSubject("充电充值");
req.setBuyerOpenId(appUser.getAliOpenid());
req.setBody("充电充值");
+ req.setNotifyUrl("/payment/ali/callBack");
AliPaymentResp data = aliPaymentClient.payment(req).getData();
if(null != data){
- data.setNotifyUrl(data.getNotifyUrl() + "/order/t-charging-order/chargingOrderALICallback");
return AjaxResult.success(data);
}
}
@@ -593,6 +621,7 @@
if(null != data && data.getChargeNum() > 0){
//计算折扣
List<AccountingStrategyDetailOrder> list = accountingStrategyDetailOrderClient.getAllAccountingStrategyDetailOrder(chargingOrder.getId()).getData();
+ list.get(list.size() - 1).setEndTime("23:59");
//将数据叠加两份，处理跨天的情况
list.addAll(list);
boolean sta = false;
@@ -625,21 +654,19 @@
long times = rechargeAmount1.divide(s_total_amount, 0, RoundingMode.DOWN).longValue();
if(times > m){
//充电时间跨度两个计费策略，需要继续对下一个策略进行计算
- serviceCharge = s_server_amount.multiply(new BigDecimal(m));
+ serviceCharge = serviceCharge.add(s_server_amount.multiply(new BigDecimal(m)));
rechargeAmount1 = rechargeAmount1.subtract(s_total_amount.multiply(new BigDecimal(m)));
- if(null != discount){
- discountAmount = discountAmount.add(serviceCharge.multiply(new BigDecimal(1).subtract(discount)));
- }
nowTimeMillis = null;
}else{
- serviceCharge = s_server_amount.multiply(new BigDecimal(times));
- if(null != discount){
- discountAmount = discountAmount.add(serviceCharge.multiply(new BigDecimal(1).subtract(discount)));
- }
+ serviceCharge = serviceCharge.add(s_server_amount.multiply(new BigDecimal(times)));
break;
}
}
}
+ if(null != discount){
+ discountAmount = serviceCharge.multiply(new BigDecimal(1).subtract(discount));
+ }
+
if(discountAmount.compareTo(BigDecimal.ZERO) >= 0){
//计算会员最大优惠金额
TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
@@ -650,9 +677,12 @@
}
}
discountAmount = discountAmount.setScale(4, RoundingMode.HALF_EVEN);
+ if(discountAmount.compareTo(BigDecimal.ZERO) >= 0){
+ data.setChargeNum(data.getChargeNum() - 1);
+ appUserVipDetailClient.updateAppUserVipDetail(data);
+ }
}
}
-
//机子上显示的金额为用户充值的金额+会员折扣金额
BigDecimal account_balance = chargingOrder.getRechargeAmount().add(discountAmount).setScale(4, RoundingMode.HALF_EVEN);
@@ -673,15 +703,15 @@
log.info(chargingOrder.getCode() + "：-------------------远程调起开始充电请求-------------------" + platformStartCharging.toString());
sendMessageClient.platformStartCharging(platformStartCharging);
- //异步线程检测远程启动的应答结果。如果失败，则需要全额退款
- Long id = chargingOrder.getId();
- //执行5分钟的定时任务检测
- ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
- scheduler.scheduleAtFixedRate(()->{
- if(timingDetection(id)){
- scheduler.shutdown();
- }
- }, 5, 1, TimeUnit.SECONDS);
+// //异步线程检测远程启动的应答结果。如果失败，则需要全额退款
+// Long id = chargingOrder.getId();
+// //执行5分钟的定时任务检测
+// ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+// scheduler.scheduleAtFixedRate(()->{
+// if(timingDetection(id)){
+// scheduler.shutdown();
+// }
+// }, 5, 1, TimeUnit.SECONDS);
return AjaxResult.success();
}
@@ -707,7 +737,7 @@
Integer counter = counter_map.get(code);
PreChargeCheck preChargeCheck1 = redisService.getCacheObject(key);
//5分钟内还未插枪则取消充电，退回金额。
- if(failure_cause == 5 && (null == counter || counter < 300)){
+ if(failure_cause == 5 && (null == counter || counter < 1800)){
counter = (null == counter ? 0 : counter) + 1;
counter_map.put(code, counter);
//启动失败
@@ -738,13 +768,17 @@
}
this.updateById(order);
redisService.setCacheObject(key, preChargeCheck1, 24L, TimeUnit.HOURS);
+ //推送三方平台订单状态
+ if(2 == chargingOrder.getOrderSource()){
+ tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
+ }
return true;
}else{
Integer counter = boot_failed_map.get(code);
log.info(code + "：-------------------未上传开启充电结果-------------------" + counter);
PreChargeCheck preChargeCheck1 = redisService.getCacheObject(key);
//5分钟内未启动成功，退回金额。
- if(null == counter || counter < 300){
+ if(null == counter || counter < 1800){
counter = (null == counter ? 0 : counter) + 1;
boot_failed_map.put(code, counter);
//启动失败
@@ -768,6 +802,10 @@
order.setEndMode(0);
this.updateById(order);
redisService.setCacheObject(key, preChargeCheck1, 24L, TimeUnit.HOURS);
+ //推送三方平台订单状态
+ if(2 == chargingOrder.getOrderSource()){
+ tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
+ }
return true;
}
}
@@ -827,9 +865,24 @@
TChargingGun chargingGun = chargingGunClient.getChargingGunById(order.getChargingGunId()).getData();
chargingGun.setStatus(4);
chargingGunClient.updateChargingGunById(chargingGun);
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(chargingGun.getFullNumber(), chargingGun.getStatus());
}
redisService.setCacheObject("AQJC_" + order.getChargingGunId(), preChargeCheck1, 24L, TimeUnit.HOURS);
this.updateById(order);
+ //推送三方平台启动充电结果
+ if(2 == order.getOrderSource()){
+ StartChargeResult result = new StartChargeResult();
+ result.setStartChargeSeq(order.getStartChargeSeq());
+ result.setStartChargeSeqStat(3 == order.getStatus() ? 2 : 4);
+ result.setConnectorID(order.getChargingGunId().toString());
+ result.setStartTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ Operator operator = operatorClient.getOperatorById(order.getOperatorId()).getData();
+ result.setOperatorID(operator.getOperatorId());
+ tcecClient.notificationStartChargeResult(result);
+
+ tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
+ }
}
/**
@@ -839,7 +892,7 @@
public void refund(String code){
log.info(code + "：-------------------充电启动失败，执行退款-------------------");
TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, code));
- if(chargingOrder.getStatus() == 2){
+ if(chargingOrder.getOrderSource() == 1 && chargingOrder.getStatus() == 2){
Integer rechargePaymentType = chargingOrder.getRechargePaymentType();
BigDecimal rechargeAmount = chargingOrder.getRechargeAmount();
//构建退款明细
@@ -869,9 +922,27 @@
amount.setTotal(rechargeAmount.multiply(new BigDecimal(100)).intValue());
amount.setCurrency("CNY");
model.setAmount(amount);
- R<String> orderR = wxPaymentClient.refundOrderR(model);
+ R<Map<String, Object>> orderR = wxPaymentClient.refundOrderR(model);
if(200 == orderR.getCode()){
chargingOrderRefundService.save(chargingOrderRefund);
+ //手续费
+ Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
+ Object refund_fee1 = amount1.get("refund_fee");
+ BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));
+ chargingOrderRefund.setRefundFee(refund_fee);
+ chargingOrderRefundService.updateById(chargingOrderRefund);
+ //回退会员折扣次数
+ if(chargingOrder.getVipDiscountAmount().compareTo(BigDecimal.ZERO) > 0){
+ TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
+ GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
+ getAppUserVipDetail.setAppUserId(chargingOrder.getAppUserId());
+ getAppUserVipDetail.setVipId(appUser.getVipId());
+ TAppUserVipDetail data = appUserVipDetailClient.getAppUserVipDetail(getAppUserVipDetail).getData();
+ if(null != data){
+ data.setChargeNum(data.getChargeNum() + 1);
+ appUserVipDetailClient.updateAppUserVipDetail(data);
+ }
+ }
}
}
if(2 == rechargePaymentType){
@@ -882,14 +953,96 @@
dto.setRefundReason("充电失败，取消充电订单");
RefundResp resp = aliPaymentClient.refund(dto).getData();
if(null != resp){
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-DDTHH:mm:ss+TIMEZONE");
- AjaxResult success = chargingOrderStartupFailureWxRefund(resp.getOutTradeNo(), resp.getTradeNo(), "SUCCESS", sdf1.format(new Date()));
- if(success.isSuccess()){
- chargingOrderRefundService.save(chargingOrderRefund);
+ chargingOrderRefundService.save(chargingOrderRefund);
+ //回退会员折扣次数
+ if(chargingOrder.getVipDiscountAmount().compareTo(BigDecimal.ZERO) > 0){
+ TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
+ GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
+ getAppUserVipDetail.setAppUserId(chargingOrder.getAppUserId());
+ getAppUserVipDetail.setVipId(appUser.getVipId());
+ TAppUserVipDetail data = appUserVipDetailClient.getAppUserVipDetail(getAppUserVipDetail).getData();
+ if(null != data){
+ data.setChargeNum(data.getChargeNum() + 1);
+ appUserVipDetailClient.updateAppUserVipDetail(data);
+ }
}
+
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ chargingOrderStartupFailureWxRefund(chargingOrderRefund.getRefundCode(), resp.getTradeNo(), "SUCCESS", null);
}
}
+ }
+ }
+
+
+
+ public void refund1(String code, BigDecimal money){
+ log.info(code + "：-------------------充电成功，执行手动退款-------------------");
+ TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, code));
+ if(chargingOrder.getOrderSource() == 1){
+ BigDecimal rechargeAmount = chargingOrder.getRechargeAmount();
+ Integer rechargePaymentType = chargingOrder.getRechargePaymentType();
+ //构建退款明细
+ TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
+ chargingOrderRefund.setChargingOrderId(chargingOrder.getId());
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ chargingOrderRefund.setRefundCode("CDF" + sdf.format(new Date()) + Double.valueOf(Math.random() * 1000).intValue());
+ chargingOrderRefund.setRefundAmount(money);
+ chargingOrderRefund.setRefundStatus(1);
+ chargingOrderRefund.setPayType(rechargePaymentType);
+ chargingOrderRefund.setRefundStatus(1);
+ chargingOrderRefund.setCode(code);
+ chargingOrderRefund.setRefundTitle("充电完成退款");
+ chargingOrderRefund.setRefundContent("充电完成退款");
+ chargingOrderRefund.setRefundReason("充电完成退款");
+ chargingOrderRefund.setRefundRemark("充电完成退款，手动退款");
+ chargingOrderRefund.setRefundTotalAmount(money);
+ chargingOrderRefund.setPayAmount(money);
+ if(1 == rechargePaymentType){
+ WxPaymentRefundModel model = new WxPaymentRefundModel();
+ model.setOut_trade_no(chargingOrder.getCode());
+ model.setOut_refund_no(chargingOrderRefund.getRefundCode());
+ model.setReason("充电完成退款");
+ model.setNotify_url("/payment/wx/refund/notify");
+ WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
+ amount.setRefund(money.multiply(new BigDecimal(100)).intValue());
+ amount.setTotal(rechargeAmount.multiply(new BigDecimal(100)).intValue());
+ amount.setCurrency("CNY");
+ model.setAmount(amount);
+ R<Map<String, Object>> orderR = wxPaymentClient.refundOrderR(model);
+ if(200 == orderR.getCode()){
+ chargingOrderRefundService.save(chargingOrderRefund);
+ //手续费
+ Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
+ Object refund_fee1 = amount1.get("refund_fee");
+ BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));
+ chargingOrderRefund.setRefundFee(refund_fee);
+ chargingOrderRefundService.updateById(chargingOrderRefund);
+ }
+ }
+ if(2 == rechargePaymentType){
+ RefundReq dto = new RefundReq();
+ dto.setOutTradeNo(chargingOrder.getCode());
+ dto.setOutRequestNo(chargingOrderRefund.getCode());
+ dto.setRefundAmount(money.toString());
+ dto.setRefundReason("充电完成退款");
+ RefundResp resp = aliPaymentClient.refund(dto).getData();
+ if(null != resp){
+ chargingOrderRefundService.save(chargingOrderRefund);
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ chargingOrderStartupFailureWxRefund(chargingOrderRefund.getRefundCode(), resp.getTradeNo(), "SUCCESS", null);
+ }
+ }
+
}
}
@@ -933,7 +1086,7 @@
Long userId = tokenService.getLoginUserApplet().getUserId();
TChargingOrder one = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getAppUserId, userId).eq(TChargingOrder::getChargingGunId, id)
.eq(TChargingOrder::getRechargePaymentStatus, 2).eq(TChargingOrder::getDelFlag, 0).orderByDesc(TChargingOrder::getStartTime).last(" limit 0, 1"));
- if(null == one){
+ if(null == one || !one.getAppUserId().equals(userId)){
return null;
}
ChargingDetails chargingDetails = new ChargingDetails();
@@ -957,16 +1110,12 @@
Integer h = Integer.valueOf(data.getCumulative_charging_time() / 60);
Integer m = Integer.valueOf(data.getCumulative_charging_time() % 60);
chargingDetails.setChargedTime(String.format("%02d", h) + ":" + String.format("%02d", m));
- }
- //转换成UTC时间
- ChargingHandshake chargingHandshake = chargingHandshakeClient.getDataByOrderCode(one.getCode()).getData();
- if(null != chargingHandshake && null != data && null != one.getAppUserCarId()){
- BigDecimal bms_battery_capacity = chargingHandshake.getBms_battery_capacity();
- TAppUserCar appUserCar = appUserCarClient.getCarByIds(Arrays.asList(one.getAppUserCarId())).getData().get(0);
- // 续航 = 电池容量 / 续航里程 * soc
- BigDecimal divide = bms_battery_capacity.divide(new BigDecimal(appUserCar.getEndurance()));
- BigDecimal multiply = new BigDecimal(data.getSoc() / 100).multiply(divide);
- chargingDetails.setEndurance(multiply);
+ if(null != one.getAppUserCarId()){
+ TAppUserCar appUserCar = appUserCarClient.getCarById(one.getAppUserCarId().toString()).getData();
+ // 续航 = 续航里程 * soc
+ BigDecimal multiply = new BigDecimal(data.getSoc()).divide(new BigDecimal(100)).multiply(new BigDecimal(appUserCar.getEndurance()));
+ chargingDetails.setEndurance(multiply.setScale(2, RoundingMode.HALF_EVEN));
+ }
}
return chargingDetails;
}
@@ -988,6 +1137,10 @@
if(status == 4 || status == 5){
return AjaxResult.error("不能重复操作");
}
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ if(!order.getAppUserId().equals(userId)){
+ return AjaxResult.error("权限不足");
+ }
TChargingOrder chargingOrder = new TChargingOrder();
chargingOrder.setId(Long.valueOf(id));
chargingOrder.setAppUserId(order.getAppUserId());
@@ -995,7 +1148,6 @@
chargingOrder.setStatus(4);
chargingOrder.setEndMode(1);
this.updateById(chargingOrder);
-
String code1 = order.getCode();
TChargingGun chargingGun = chargingGunClient.getChargingGunById(order.getChargingGunId()).getData();
//异步线程处理停机
@@ -1010,6 +1162,11 @@
log.info(code1 + "：-------------------远程停止充电请求-------------------");
log.info(platformStopCharging.toString());
});
+ //推送三方平台
+ if(2 == order.getOrderSource()){
+ tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
+ }
+
return AjaxResult.success();
}
@@ -1092,6 +1249,7 @@
if(1 == doubleIntegration){
num1 *= 2;
}
+
}
GetInviteUser query = new GetInviteUser();
@@ -1142,7 +1300,7 @@
TChargingGun chargingGun = chargingGunClient.getChargingGunByCode(code).getData();
TChargingOrder order = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, chargingGun.getId())
.orderByDesc(TChargingOrder::getEndTime).eq(TChargingOrder::getRechargePaymentStatus, 2).last(" limit 0, 1"));
- if(null != order && order.getStatus() != 3){
+ if(null != order && order.getStatus() != 4){
return;
}
@@ -1181,8 +1339,11 @@
@Override
public TCharingOrderVO chargingOrder(ChargingOrderQuery dto) {
TCharingOrderVO tCharingOrderVO = new TCharingOrderVO();
-
-
+ List<TChargingGun> allGun = chargingGunClient.getAllGun().getData();
+ List<TChargingPile> allPile = chargingGunClient.getAllPile().getData();
+ List<Site> data9 = siteClient.getSiteAll().getData();
+ List<TAppUser> data6 = appUserClient.getAllUser().getData();
+ List<TAppUserCar> data4 = appUserCarClient.getAllCar().getData();
String startTime1 = null;
String startTime2 = null;
String endTime1 = null;
@@ -1199,7 +1360,6 @@
endTime2 = split[1];
}
PageInfo<ChargingOrderVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
- PageInfo<ChargingOrderVO> pageInfo1 = new PageInfo<>(1,9999999);
if (StringUtils.hasLength(dto.getPhone())){
List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
@@ -1209,81 +1369,163 @@
}
dto.setUserIds(data);
}
+ Long userId = tokenService.getLoginUser().getUserid();
+ // 查询当前登陆人按钮权限
+ SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
+ Integer roleType = sysUser.getRoleType();
+ //如果没传siteId,获取当前登陆人所有的siteIds
+ List<Integer> siteIds = new ArrayList<>();
+ if (dto.getSiteId()==null){
+ if (userId != null){
+ List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
+ for (GetSiteListDTO datum : data) {
+ siteIds.add(datum.getId());
+ }
+ }
+ }else {
+ siteIds.add(dto.getSiteId());
+ }
+ if (siteIds.isEmpty()){
+ siteIds.add(-1);
+ }else{
+ if (roleType == 2){
+ List<Integer> integers = new ArrayList<>();
+ for (Integer siteId : siteIds) {
+ // 校验有没有这个站点的权限
+ List<Boolean> t1= partnerClient.getChargingOrderMenu(sysUser.getObjectId(),siteId).getData();
+
+ Boolean b = t1.get(1);
+ if (b){
+ integers.add(siteId);
+ }
+ }
+ siteIds = integers;
+ }
+ }
+ if (siteIds.isEmpty())siteIds.add(-1);
+ dto.setSiteIds(siteIds);
List<ChargingOrderVO> list = this.baseMapper.chargingOrder(pageInfo,dto,startTime1,startTime2,endTime1,endTime2);
- List<ChargingOrderVO> list1 = this.baseMapper.chargingOrder(pageInfo1,dto,startTime1,startTime2,endTime1,endTime2);
BigDecimal total = new BigDecimal("0");
long time = 0L;
- BigDecimal income = new BigDecimal("0");
BigDecimal electronicMoney = new BigDecimal("0");
BigDecimal serviceMoney = new BigDecimal("0");
+ BigDecimal commissionMoney = new BigDecimal("0");
+// BigDecimal refundMoney = new BigDecimal("0");
+ BigDecimal paymentMoney = new BigDecimal("0");
+ List<TChargingOrderAccountingStrategy> list3 = chargingOrderAccountingStrategyService.list();
+
for (ChargingOrderVO chargingOrderVO : list) {
- chargingOrderVO.setCommissionAmount(chargingOrderVO.getOrderAmount().multiply(new BigDecimal("0.006")));
- chargingOrderVO.setPlatFormMoney(chargingOrderVO.getOrderAmount().multiply(new BigDecimal("0.006")));
+ if (roleType == 2){
+ for (Integer siteId : siteIds) {
+ // 校验有没有这个站点的权限
+ List<Boolean> t1= partnerClient.getChargingOrderMenu(sysUser.getObjectId(),siteId).getData();
+ chargingOrderVO.setAuthRecord(t1.get(0));
+ }
+ }
+ chargingOrderVO.setCommissionAmount(chargingOrderVO.getRechargeAmount()!=null?chargingOrderVO.getRechargeAmount().multiply(new BigDecimal("0.006")):new BigDecimal("0"));
+ chargingOrderVO.setPlatFormMoney(chargingOrderVO.getRechargeAmount()!=null?chargingOrderVO.getRechargeAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
chargingOrderVO.setUid(chargingOrderVO.getId()+"");
- TChargingGun data3 = chargingGunClient.getChargingGunById(chargingOrderVO.getChargingGunId()).getData();
- TChargingPile data2 = chargingPileClient.getChargingPileById(chargingOrderVO.getChargingPileId()).getData();
+ TChargingGun data3 = allGun.stream().filter(e->e.getId().equals(chargingOrderVO.getChargingGunId())).findFirst().orElse(null);
+ TChargingPile data2 = allPile.stream().filter(e->e.getId().equals(chargingOrderVO.getChargingPileId())).findFirst().orElse(null);
if (chargingOrderVO.getSiteId()!=null){
List<Integer> integers = new ArrayList<>();
integers.add(chargingOrderVO.getSiteId());
- List<Site> data = siteClient.getSiteByIds(integers).getData();
- if (!data.isEmpty())chargingOrderVO.setSiteName(data.get(0).getName());
+ Site site = data9.stream().filter(e -> e.getId().equals(chargingOrderVO.getSiteId())).findFirst().orElse(null);
+ if (site!=null)chargingOrderVO.setSiteName(site.getName());
}
if (data2!=null && data3!=null){
chargingOrderVO.setTerminalName(data2.getName()+"-"+data3.getName());
}
// 充电订单 明细记录
- List<TChargingOrderAccountingStrategy> chargingOrderId = chargingOrderAccountingStrategyService.list(new QueryWrapper<TChargingOrderAccountingStrategy>()
- .eq("charging_order_id", chargingOrderVO.getId()));
- UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrderVO.getCode()).getData();
- if (data5!=null){
- long l = data5.getCumulative_charging_time() * 60L;
- chargingOrderVO.setChargingSecond(l);
+ List<TChargingOrderAccountingStrategy> chargingOrderId = list3.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderVO.getId())).collect(Collectors.toList());
+ if (chargingOrderVO.getStartTime()!=null && chargingOrderVO.getEndTime()!=null){
+ LocalDateTime startTime = chargingOrderVO.getStartTime();
+ LocalDateTime endTime = chargingOrderVO.getEndTime();
+ // 计算时间差 单位秒
+ long between = ChronoUnit.SECONDS.between(startTime, endTime);
+ chargingOrderVO.setChargingSecond(between);
+
+ BigDecimal electronic_reduce = chargingOrderId.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ chargingOrderVO.setElectrovalence(electronic_reduce);
+ BigDecimal service_reduce = chargingOrderId.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ if (!chargingOrderVO.getOrderSource().equals(2)){
+ chargingOrderVO.setServiceCharge(service_reduce);
+ chargingOrderVO.setSharingAmount(BigDecimal.ZERO);
+ }else{
+ chargingOrderVO.setServiceCharge(service_reduce.multiply(new BigDecimal("0.8")));
+ chargingOrderVO.setSharingAmount(service_reduce.multiply(new BigDecimal("0.2")));
+ }
}
// 充电时段数
int size = chargingOrderId.size();
chargingOrderVO.setCount(size);
// 用户手机号
- TAppUser data = appUserClient.getUserById(chargingOrderVO.getAppUserId()).getData();
+ TAppUser data = data6.stream().filter(e -> e.getId().equals(chargingOrderVO.getAppUserId())).findFirst().orElse(null);
if (data!=null){
// 车牌号
chargingOrderVO.setPhone(data.getPhone());
List<Long> longs = new ArrayList<>();
if (chargingOrderVO.getAppUserCarId()!=null){
longs.add(chargingOrderVO.getAppUserCarId());
- List<TAppUserCar> data1 = appUserCarClient.getCarByIds(longs).getData();
- if (!data1.isEmpty()){
- chargingOrderVO.setLicensePlate(data1.get(0).getLicensePlate());
+ TAppUserCar tAppUserCar = data4.stream().filter(e -> e.getId().equals(chargingOrderVO.getAppUserCarId())).findFirst().orElse(null);
+ if (tAppUserCar!=null){
+ chargingOrderVO.setLicensePlate(tAppUserCar.getLicensePlate());
}
+ }else{
+ chargingOrderVO.setLicensePlate(chargingOrderVO.getPlateNum());
}
}
}
- for (ChargingOrderVO chargingOrderVO : list1) {
- if (chargingOrderVO.getChargingCapacity()!=null){
- total = total.add(chargingOrderVO.getElectricity());
- }
- // 充电订单 明细记录
- List<TChargingOrderAccountingStrategy> chargingOrderId = chargingOrderAccountingStrategyService.list(new QueryWrapper<TChargingOrderAccountingStrategy>()
- .eq("charging_order_id", chargingOrderVO.getId()));
- UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrderVO.getCode()).getData();
- if (data5!=null){
- long l = data5.getCumulative_charging_time() * 60L;
- chargingOrderVO.setChargingSecond(l);
- time+=l;
- }
- electronicMoney = electronicMoney.add(chargingOrderVO.getElectrovalence());
- serviceMoney = serviceMoney.add(chargingOrderVO.getServiceCharge());
- income = income.add(chargingOrderVO.getPaymentAmount());
-
-
-
+// List<TChargingOrderRefund> chargingOrderRefunds = chargingOrderRefundService.lambdaQuery()
+// .eq(TChargingOrderRefund::getRefundStatus,2).list();
+
+
+ Map<String, Object> map = this.baseMapper.chargingOrderNolimit(dto,startTime1,startTime2,endTime1,endTime2);
+// for (ChargingOrderVO chargingOrderVO : list1) {
+// if(null == chargingOrderVO.getStatus() || 5 != chargingOrderVO.getStatus()){
+// continue;
+// }
+// List<TChargingOrderAccountingStrategy> list4 = list3.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderVO.getId())).collect(Collectors.toList());
+// BigDecimal electronic_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal service_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal chargingCapacity = list4.stream().map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
+// electronicMoney = electronicMoney.add(electronic_reduce);
+// total = total.add(chargingCapacity);
+// if (!chargingOrderVO.getOrderSource().equals(2)) {
+// serviceMoney = serviceMoney.add(service_reduce);
+// paymentMoney = paymentMoney.add(electronic_reduce).add(service_reduce);
+// }else{
+// serviceMoney = serviceMoney.add(service_reduce.multiply(new BigDecimal("0.8")));
+// paymentMoney = paymentMoney.add(electronic_reduce).add(service_reduce.multiply(new BigDecimal("0.8")));
+// }
+// if (chargingOrderVO.getStartTime()!=null && chargingOrderVO.getEndTime()!=null){
+// LocalDateTime startTime = chargingOrderVO.getStartTime();
+// LocalDateTime endTime = chargingOrderVO.getEndTime();
+// // 计算时间差 单位秒
+// long between = ChronoUnit.SECONDS.between(startTime, endTime);
+// time+=between;
+// }
+//// List<TChargingOrderRefund> list2 = chargingOrderRefunds.stream().filter(e -> e.getChargingOrderId() != null && e.getChargingOrderId().equals(chargingOrderVO.getId()))
+//// .collect(Collectors.toList());
+//// for (TChargingOrderRefund tChargingOrderRefund : list2) {
+//// refundMoney = refundMoney.add(tChargingOrderRefund.getRefundTotalAmount());
+//// }
+// }
+ if(null != map){
+ tCharingOrderVO.setTotal(map.get("total")==null?BigDecimal.ZERO:(BigDecimal) map.get("total"));
+ tCharingOrderVO.setTime(map.get("time")==null?0L:(Long) map.get("time"));
+ tCharingOrderVO.setIncome((map.get("paymentMoney")==null?BigDecimal.ZERO:(BigDecimal) map.get("paymentMoney")).setScale(2, BigDecimal.ROUND_HALF_EVEN));
+ tCharingOrderVO.setElectronicMoney((map.get("electronicMoney")==null?BigDecimal.ZERO:(BigDecimal) map.get("electronicMoney")).setScale(2, BigDecimal.ROUND_HALF_EVEN));
+ tCharingOrderVO.setServiceMoney((map.get("serviceMoney")==null?BigDecimal.ZERO:(BigDecimal) map.get("serviceMoney")).setScale(2, BigDecimal.ROUND_HALF_EVEN));
+ }else{
+ tCharingOrderVO.setTotal(BigDecimal.ZERO);
+ tCharingOrderVO.setTime(0L);
+ tCharingOrderVO.setIncome(BigDecimal.ZERO);
+ tCharingOrderVO.setElectronicMoney(BigDecimal.ZERO);
+ tCharingOrderVO.setServiceMoney(BigDecimal.ZERO);
}
- tCharingOrderVO.setTotal(total);
- tCharingOrderVO.setTime(time);
- tCharingOrderVO.setIncome(income);
- tCharingOrderVO.setElectronicMoney(electronicMoney);
- tCharingOrderVO.setServiceMoney(serviceMoney);
pageInfo.setRecords(list);
tCharingOrderVO.setList(pageInfo);
return tCharingOrderVO;
@@ -1333,42 +1575,58 @@
}
@Override
- public Map<String, Object> countAll(LocalDate sixBefore) {
- return this.baseMapper.countAll(sixBefore);
+ public Map<String, Object> countAll(List<Integer> siteIds) {
+ return this.baseMapper.countAll(siteIds);
}
@Override
- public List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds) {
- return this.baseMapper.getSumByType(chargingOrderIds);
+ public List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end,List<Integer> siteIds) {
+ LocalDateTime start1 = start.atStartOfDay();
+ LocalDateTime end1 = end.atTime(LocalTime.MAX);
+ return this.baseMapper.getSumByType(start1,end1, siteIds);
}
@Override
- public List<Map<String, Object>> getDateData(List<Long> chargingOrderIds) {
- return this.baseMapper.getDateData(chargingOrderIds);
+ public List<Map<String, Object>> getDateData(LocalDate start,LocalDate end,List<Integer> siteIds) {
+ LocalDateTime start1 = start.atStartOfDay();
+ LocalDateTime end1 = end.atTime(LocalTime.MAX);
+ return this.baseMapper.getDateData(start1,end1, siteIds);
}
@Override
- public List<Map<String, Object>> getWeekData(List<Long> chargingOrderIds) {
- return this.baseMapper.getWeekData(chargingOrderIds);
+ public List<Map<String, Object>> getWeekData(LocalDate start,LocalDate end,List<Integer> siteIds) {
+ LocalDateTime start1 = start.atStartOfDay();
+ LocalDateTime end1 = end.atTime(LocalTime.MAX);
+ return this.baseMapper.getWeekData(start1,end1,siteIds);
}
@Override
- public List<Map<String, Object>> getMonthData(List<Long> chargingOrderIds) {
- return this.baseMapper.getMonthData(chargingOrderIds);
+ public List<Map<String, Object>> getMonthData(LocalDate start,LocalDate end,List<Integer> siteIds) {
+ LocalDateTime start1 = start.atStartOfDay();
+ LocalDateTime end1 = end.atTime(LocalTime.MAX);
+ return this.baseMapper.getMonthData(start1,end1,siteIds);
}
@Override
- public List<Map<String, Object>> getYearData(List<Long> chargingOrderIds) {
- return this.baseMapper.getYearData(chargingOrderIds);
+ public List<Map<String, Object>> getYearData(LocalDate start,LocalDate end,List<Integer> siteIds) {
+ LocalDateTime start1 = start.atStartOfDay();
+ LocalDateTime end1 = end.atTime(LocalTime.MAX);
+ return this.baseMapper.getYearData(start1,end1,siteIds);
}
-
+ @Resource
+ private SysUserClient sysUserClient;
+
+
@Override
public ChargingOrderTimeVO chargingList(ChargingListQuery dto) {
String startTime1 = null;
String startTime2 = null;
String endTime1 = null;
String endTime2 = null;
+
+ List<TChargingGun> allGun = chargingGunClient.getAllGun().getData();
+ List<TChargingPile> allPile = chargingGunClient.getAllPile().getData();
if (StringUtils.hasLength(dto.getStartTime())){
String[] split = dto.getStartTime().split(" - ");
@@ -1406,36 +1664,78 @@
dto.setCarIds(carIds);
}
}
+ Long userId = tokenService.getLoginUser().getUserid();
+ // 查询当前登陆人按钮权限
+ SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
+ Integer roleType = sysUser.getRoleType();
+ //如果没传siteId,获取当前登陆人所有的siteIds
+ List<Integer> siteIds = new ArrayList<>();
+ if (dto.getSiteId()==null){
+ if (userId != null){
+ List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
+ for (GetSiteListDTO datum : data) {
+ siteIds.add(datum.getId());
+ }
+ }
+ }else {
+ siteIds.add(dto.getSiteId());
+ }
+ if (siteIds.isEmpty()){
+ siteIds.add(-1);
+ }else{
+ if (roleType == 2){
+ List<Integer> integers = new ArrayList<>();
+ for (Integer siteId : siteIds) {
+ // 校验有没有这个站点的权限
+ List<Boolean> t1= partnerClient.getChargingOrderMenu(sysUser.getObjectId(),siteId).getData();
+
+ Boolean b = t1.get(1);
+ if (b){
+ integers.add(siteId);
+ }
+ }
+ siteIds = integers;
+ }
+ }
+ dto.setSiteIds(siteIds);
PageInfo<ChargingOrderListVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
List<ChargingOrderListVO> list = this.baseMapper.chargingList(pageInfo,dto,startTime1,startTime2,endTime1,endTime2);
+ List<Integer> siteIdsList = list.stream().map(ChargingOrderListVO::getSiteId).collect(Collectors.toList());
+ if (siteIdsList.isEmpty())siteIdsList.add(-1);
+ List<Site> sites = siteClient.getSiteByIds(siteIdsList).getData();
+
for (ChargingOrderListVO chargingOrderListVO : list) {
+ if (roleType==2){
+ List<Boolean> data = partnerClient.getChargingListMenu(sysUser.getObjectId(), chargingOrderListVO.getSiteId()).getData();
+ chargingOrderListVO.setAuthInfo(data.get(0));
+ chargingOrderListVO.setAuthCurve(data.get(1));
+ }
chargingOrderListVO.setChargingCapacity(chargingOrderListVO.getElectricity());
BigDecimal bigDecimal = new BigDecimal("0.006");
if (chargingOrderListVO.getOrderAmount()!=null){
- chargingOrderListVO.setCommissionAmount(chargingOrderListVO.getPaymentAmount().multiply(bigDecimal));
+ chargingOrderListVO.setCommissionAmount(chargingOrderListVO.getRechargeAmount().multiply(bigDecimal));
}
chargingOrderListVO.setPaymentAmount(chargingOrderListVO.getPaymentAmount());
chargingOrderListVO.setUid(chargingOrderListVO.getId()+"");
List<Integer> integers = new ArrayList<>();
integers.add(chargingOrderListVO.getSiteId());
- List<Site> data = siteClient.getSiteByIds(integers).getData();
- if (!data.isEmpty()) {
- chargingOrderListVO.setSiteName(data.get(0).getName());
+ Site site = sites.stream().filter(e -> e.getId().equals(chargingOrderListVO.getSiteId())).findFirst().orElse(null);
+ if (site!=null){
+ chargingOrderListVO.setSiteName(site.getName());
}
if (chargingOrderListVO.getChargingGunId()!=null && chargingOrderListVO.getChargingPileId()!=null){
- TChargingGun data1 = chargingGunClient.getChargingGunById(chargingOrderListVO.getChargingGunId()).getData();
- TChargingPile data2 = chargingPileClient.getChargingPileById(chargingOrderListVO.getChargingPileId()).getData();
+ TChargingGun data1 = allGun.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingGunId())).findFirst().orElse(null);
+ TChargingPile data2 = allPile.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingPileId())).findFirst().orElse(null);
if (data2 != null && data1 != null) {
chargingOrderListVO.setTerminalName(data2.getName() + "-" + data1.getName());
}
}
- // 获取充电时间
- UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrderListVO.getCode()).getData();
- if (data5!=null){
- if (data5.getTime_remaining()!=null){
- chargingOrderListVO.setChargingSecond(data5.getCumulative_charging_time()*60L);
-
- }
+ if (chargingOrderListVO.getStartTime()!=null && chargingOrderListVO.getEndTime()!=null){
+ LocalDateTime startTime = chargingOrderListVO.getStartTime();
+ LocalDateTime endTime = chargingOrderListVO.getEndTime();
+ // 计算时间差 单位秒
+ long between = ChronoUnit.SECONDS.between(startTime, endTime);
+ chargingOrderListVO.setChargingSecond(between);
}
// 获取开始SOC 结束soc
if (chargingOrderListVO.getCode()!=null){
@@ -1469,9 +1769,10 @@
chargingOrderListVO.setLicensePlate(data4.get(0).getLicensePlate());
}
}
+ }else{
+ chargingOrderListVO.setLicensePlate(chargingOrderListVO.getPlateNum());
}
chargingOrderListVO.setPhone(data3.getPhone());
-
}
}
List<TChargingOrderAccountingStrategy> list2 = chargingOrderAccountingStrategyService.lambdaQuery()
@@ -1515,11 +1816,39 @@
"0"+"%(平)/"+
"0"+"%(谷)");
}
-
+ if (chargingOrderListVO.getOrderSource().equals(2)){
+ chargingOrderListVO.setSharingAmount(chargingOrderListVO.getServiceCharge()!=null?
+ chargingOrderListVO.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_HALF_UP)
+ :new BigDecimal("0"));
+ }else{
+ chargingOrderListVO.setSharingAmount(new BigDecimal("0"));
+ }
}
// 不分页
PageInfo<ChargingOrderListVO> pageInfo1 = new PageInfo<>(1,999999999);
List<ChargingOrderListVO> list1 = this.baseMapper.chargingList(pageInfo1,dto,startTime1,startTime2,endTime1,endTime2);
+ for (ChargingOrderListVO chargingOrderListVO : list1) {
+ List<Integer> integers = new ArrayList<>();
+ integers.add(chargingOrderListVO.getSiteId());
+ Site site = sites.stream().filter(e -> e.getId().equals(chargingOrderListVO.getSiteId())).findFirst().orElse(null);
+ if (site!=null){
+ chargingOrderListVO.setSiteName(site.getName());
+ }
+ if (chargingOrderListVO.getStartTime()!=null && chargingOrderListVO.getEndTime()!=null){
+ LocalDateTime startTime = chargingOrderListVO.getStartTime();
+ LocalDateTime endTime = chargingOrderListVO.getEndTime();
+ // 计算时间差 单位秒
+ long between = ChronoUnit.SECONDS.between(startTime, endTime);
+ chargingOrderListVO.setChargingSecond(between);
+ }
+ if (chargingOrderListVO.getChargingGunId()!=null && chargingOrderListVO.getChargingPileId()!=null){
+ TChargingGun data1 = allGun.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingGunId())).findFirst().orElse(null);
+ TChargingPile data2 = allPile.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingPileId())).findFirst().orElse(null);
+ if (data2 != null && data1 != null) {
+ chargingOrderListVO.setTerminalName(data2.getName() + "-" + data1.getName());
+ }
+ }
+ }
chargingOrderTimeVO.setExportList(list1);
chargingOrderTimeVO.setOrderCount(list1.size());
// 计算充电总度数
@@ -1545,66 +1874,105 @@
BigDecimal feng = new BigDecimal("0");
BigDecimal ping = new BigDecimal("0");
BigDecimal gu = new BigDecimal("0");
+ List<TChargingOrderAccountingStrategy> chargingOrderAccountingStrategies = chargingOrderAccountingStrategyService.list();
for (ChargingOrderListVO chargingOrderListVO : list1) {
- if (chargingOrderListVO.getChargingCapacity()!=null)electronic = electronic.add(chargingOrderListVO.getElectricity());
-
- if (chargingOrderListVO.getPaymentAmount()!=null)paymentAmount = paymentAmount.add(chargingOrderListVO.getPaymentAmount());
- if (chargingOrderListVO.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:
- if (temp.getChargingCapacity()!=null)jian = jian.add(temp.getChargingCapacity());
- if (temp.getChargingCapacity()!=null)jianElectronic = jianElectronic.add(temp.getElectrovalence());
- if (temp.getChargingCapacity()!=null)jianService = jianService.add(temp.getServiceCharge());
- break;
- case 2:
- if (temp.getChargingCapacity()!=null)feng = feng.add(temp.getChargingCapacity());
- if (temp.getChargingCapacity()!=null)fengElectronic = fengElectronic.add(temp.getElectrovalence());
- if (temp.getChargingCapacity()!=null)fengService = fengService.add(temp.getServiceCharge());
- break;
- case 3:
- if (temp.getChargingCapacity()!=null)ping = ping.add(temp.getChargingCapacity());
- if (temp.getChargingCapacity()!=null)pingElectronic = pingElectronic.add(temp.getElectrovalence());
- if (temp.getChargingCapacity()!=null)pingService = pingService.add(temp.getServiceCharge());
- break;
- case 4:
- if (temp.getChargingCapacity()!=null)gu = gu.add(temp.getChargingCapacity());
- if (temp.getChargingCapacity()!=null)guElectronic = guElectronic.add(temp.getElectrovalence());
- if (temp.getChargingCapacity()!=null)guService = guService.add(temp.getServiceCharge());
- break;
+ List<TChargingOrderAccountingStrategy> collect = chargingOrderAccountingStrategies.stream().filter(s -> s.getChargingOrderId().equals(chargingOrderListVO.getId())).collect(Collectors.toList());
+ BigDecimal periodServicePrice = collect.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal periodElectricPrice = collect.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal chargingCapacity = collect.stream().map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ electronic = electronic.add(chargingCapacity);
+ electrovalence = electrovalence.add(periodElectricPrice);
+ if (chargingOrderListVO.getOrderSource().equals(2)){
+ serviceCharge = serviceCharge.add(periodServicePrice.multiply(new BigDecimal("0.8")));
+ paymentAmount = paymentAmount.add(periodElectricPrice).add(periodServicePrice.multiply(new BigDecimal("0.8")));
+ }else{
+ serviceCharge = serviceCharge.add(periodServicePrice);
+ paymentAmount = paymentAmount.add(periodElectricPrice).add(periodServicePrice);
+ }
+ if (!chargingOrderListVO.getOrderSource().equals(2)){
+ List<TChargingOrderAccountingStrategy> list2 = chargingOrderAccountingStrategies.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderListVO.getId()))
+ .collect(Collectors.toList());
+ for (TChargingOrderAccountingStrategy temp : list2) {
+ switch (temp.getType()){
+ case 1:
+ jian = jian.add(temp.getChargingCapacity());
+ jianElectronic = jianElectronic.add(temp.getPeriodElectricPrice()).add(temp.getPeriodServicePrice());
+ jianService = jianService.add(temp.getPeriodServicePrice());
+ break;
+ case 2:
+ feng = feng.add(temp.getChargingCapacity());
+ fengElectronic = fengElectronic.add(temp.getPeriodElectricPrice()).add(temp.getPeriodServicePrice());
+ fengService = fengService.add(temp.getPeriodServicePrice());
+ break;
+ case 3:
+ ping = ping.add(temp.getChargingCapacity());
+ pingElectronic = pingElectronic.add(temp.getPeriodElectricPrice()).add(temp.getPeriodServicePrice());
+ pingService = pingService.add(temp.getPeriodServicePrice());
+ break;
+ case 4:
+ gu = gu.add(temp.getChargingCapacity());
+ guElectronic = guElectronic.add(temp.getPeriodElectricPrice()).add(temp.getPeriodServicePrice());
+ guService = guService.add(temp.getPeriodServicePrice());
+ break;
+ }
+ }
+ }else{
+ List<TChargingOrderAccountingStrategy> list2 = chargingOrderAccountingStrategies.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderListVO.getId()))
+ .collect(Collectors.toList());
+ for (TChargingOrderAccountingStrategy temp : list2) {
+ BigDecimal multiply = temp.getPeriodServicePrice().multiply(new BigDecimal("0.8"));
+ switch (temp.getType()){
+ case 1:
+ jian = jian.add(temp.getChargingCapacity());
+ jianElectronic = jianElectronic.add(temp.getPeriodElectricPrice()).add(multiply);
+ jianService = jianService.add(multiply);
+ break;
+ case 2:
+ feng = feng.add(temp.getChargingCapacity());
+ fengElectronic = fengElectronic.add(temp.getPeriodElectricPrice()).add(multiply);
+ fengService = fengService.add(multiply);
+ break;
+ case 3:
+ ping = ping.add(temp.getChargingCapacity());
+ pingElectronic = pingElectronic.add(temp.getPeriodElectricPrice()).add(multiply);
+ pingService = pingService.add(multiply);
+ break;
+ case 4:
+ gu = gu.add(temp.getChargingCapacity());
+ guElectronic = guElectronic.add(temp.getPeriodElectricPrice()).add(multiply);
+ guService = guService.add(multiply);
+ break;
+ }
}
}
}
- chargingOrderTimeVO.setChargingCapacity(electronic);
- chargingOrderTimeVO.setPaymentAmount(paymentAmount);
- chargingOrderTimeVO.setElectrovalence(electrovalence);
- chargingOrderTimeVO.setServiceCharge(serviceCharge);
- // 计算尖峰平谷充电量占比
+ chargingOrderTimeVO.setChargingCapacity(electronic.setScale(2, BigDecimal.ROUND_HALF_EVEN));
+ chargingOrderTimeVO.setPaymentAmount(paymentAmount.setScale(2, BigDecimal.ROUND_HALF_EVEN));
+ chargingOrderTimeVO.setElectrovalence(electrovalence.setScale(2, BigDecimal.ROUND_HALF_EVEN));
+ chargingOrderTimeVO.setServiceCharge(serviceCharge.setScale(2, BigDecimal.ROUND_HALF_EVEN));
+ // 计算尖峰平谷充电到账占比
BigDecimal add = jianElectronic.add(fengElectronic).add(pingElectronic).add(guElectronic);
// 计算尖峰平谷服务费占比
BigDecimal add1 = jianService.add(fengService).add(pingService).add(guService);
- // 计算尖峰平谷充电到账占比
+ // 计算尖峰平谷充电量占比
BigDecimal add2 = jian.add(feng).add(ping).add(gu);
if (add.compareTo(new BigDecimal("0"))!=0){
- chargingOrderTimeVO.setCapacityProportion(jianElectronic+"度/"+fengElectronic+"度/"+pingElectronic+"度/"+guElectronic+"度-"
- +jianElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
- +fengElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
- +pingElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
- +guElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%");
+ chargingOrderTimeVO.setCapacityProportion(jian+"度/"+feng+"度/"+ping+"度/"+gu+"度-"
+ +jian.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+ +feng.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+ +ping.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+ +gu.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%");
chargingOrderTimeVO.setServiceProportion(jianService+"元/"+fengService+"元/"+pingService+"元/"+guService+"元-"
+jianService.divide(add1,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+fengService.divide(add1,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+pingService.divide(add1,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+guService.divide(add1,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%");
- chargingOrderTimeVO.setElectronicProportion(jian+"元/"+feng+"元/"+ping+"元/"+gu+"元-"
- +jian.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
- +feng.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
- +ping.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
- +gu.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%");
+ chargingOrderTimeVO.setElectronicProportion(jianElectronic+"元/"+fengElectronic+"元/"+pingElectronic+"元/"+guElectronic+"元-"
+ +jianElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+ +fengElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+ +pingElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+ +guElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%");
}else{
chargingOrderTimeVO.setCapacityProportion(jianElectronic+"度/"+fengElectronic+"度/"+pingElectronic+"度/"+guElectronic+"度-"
+"0"+"%/"
@@ -1634,6 +2002,8 @@
public ChargingOrderListInfoVO chargingInfo(String uid) {
TChargingOrder chargingOrder= this.getById(uid);
ChargingOrderListInfoVO chargingOrderListInfoVO = new ChargingOrderListInfoVO();
+ chargingOrderListInfoVO.setStartTime(chargingOrder.getStartTime());
+ chargingOrderListInfoVO.setEndTime(chargingOrder.getEndTime());
chargingOrderListInfoVO.setStatus(chargingOrder.getStatus());
BigDecimal bigDecimal = new BigDecimal("0.006");
if (chargingOrder.getOrderAmount()!=null){
@@ -1710,18 +2080,21 @@
chargingOrderListInfoVO.setList(data6);
}
- // 获取充电时间
- UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
- if (data5!=null){
- if (data5.getTime_remaining()!=null){
- chargingOrderListInfoVO.setChargingSecond(data5.getCumulative_charging_time()*60L+"");
-
- }
+ if (chargingOrderListInfoVO.getStartTime()!=null && chargingOrderListInfoVO.getEndTime()!=null){
+ LocalDateTime startTime = chargingOrderListInfoVO.getStartTime();
+ LocalDateTime endTime = chargingOrderListInfoVO.getEndTime();
+ // 计算时间差 单位秒
+ long between = ChronoUnit.SECONDS.between(startTime, endTime);
+ chargingOrderListInfoVO.setChargingSecond(between+"");
}
if (chargingOrder.getAppUserCarId()!=null){
List<TAppUserCar> data3 = appUserCarClient.getCarByIds(Collections.singletonList(chargingOrder.getAppUserCarId())).getData();
- if (data3!=null && !data3.isEmpty())chargingOrderListInfoVO.setLicensePlate(data3.get(0).getLicensePlate());
+ if (data3!=null && !data3.isEmpty()) {
+ chargingOrderListInfoVO.setLicensePlate(data3.get(0).getLicensePlate());
+ }
+ }else{
+ chargingOrderListInfoVO.setLicensePlate(chargingOrder.getPlateNum());
}
chargingOrderListInfoVO.setStartTime(chargingOrder.getStartTime());
chargingOrderListInfoVO.setEndTime(chargingOrder.getEndTime());
@@ -1729,7 +2102,12 @@
chargingOrderListInfoVO.setUid(chargingOrder.getId().toString());
chargingOrderListInfoVO.setCouponDiscountAmount(chargingOrder.getCouponDiscountAmount());
chargingOrderListInfoVO.setVipDiscountAmount(chargingOrder.getVipDiscountAmount());
- chargingOrderListInfoVO.setSharingAmount(chargingOrder.getSharingAmount());
+ if (chargingOrder.getOrderSource().equals(2)){
+ chargingOrderListInfoVO.setSharingAmount(chargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_HALF_UP));
+ }else{
+ chargingOrderListInfoVO.setSharingAmount(chargingOrder.getSharingAmount());
+
+ }
// 查询费用明细列表
List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery()
.eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId())
@@ -1770,7 +2148,7 @@
chargingOrder.setChargingCapacity(query.getCharging_degree());
chargingOrder.setElectricity(query.getCharging_degree());
chargingOrder.setTotalElectricity(new BigDecimal(100 - query.getSoc()));
- BmsDemandAndChargerExportation data = bmsDemandAndChargerExportationClient.getBmsDemandAndChargerExportation(chargingOrder.getCode()).getData();
+ BmsDemandAndChargerExportation data = bmsDemandAndChargerExportationClient.getBmsDemandAndChargerExportation(chargingOrder1.getCode()).getData();
if(null != data){
chargingOrder.setNeedElec(data.getBms_current_requirements());
}
@@ -1810,18 +2188,22 @@
*/
@Override
@GlobalTransactional(rollbackFor = Exception.class)
- public void endChargeBillingCharge(TransactionRecordMessageVO vo) {
+ public R endChargeBillingCharge(TransactionRecordMessageVO vo) {
TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, vo.getTransaction_serial_number()));
+ if(null == chargingOrder){
+ return R.ok();
+ }
Integer status = chargingOrder.getStatus();
if(status == 5){
- return;
+ return R.ok();
}
//如果使用优惠券需要判断优惠券是否满足使用条件
- //根据实际的充电金额计算退款金额 退回费用=(原金额/总金额)*(总金额-实际充电金额)
//退款金额=优惠券金额+剩余充电金额
BigDecimal periodElectricPrice_total = BigDecimal.ZERO;
BigDecimal periodServicePrice_total = BigDecimal.ZERO;
+ BigDecimal vipDiscountAmount_total = BigDecimal.ZERO;
+ BigDecimal serviceCharge_total = BigDecimal.ZERO;
BigDecimal total = BigDecimal.ZERO;
//获取订单的计费策略
@@ -1831,83 +2213,135 @@
chargingOrderAccountingStrategyService.remove(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId()));
SimpleDateFormat sdfs = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<AccountingStrategyDetailOrderVo> lists = new ArrayList<>();
- for (int i = 0; i < accountingStrategyDetailOrderList.size(); i++) {
- Class<? extends TransactionRecordMessageVO> clazz = vo.getClass();
- try {
- AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.get(i);
- //阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）
- Object invoke = null;
- switch (strategyDetail.getType()){
- case 1:
- //充电度数
- invoke = clazz.getMethod("getSpike_charge" + (i + 1)).invoke(vo);
+ try {
+ //跨天
+ if(!vo.getStart_time().split(" ")[0].equals(vo.getEnd_time().split(" ")[0])){
+ //当天的
+ //开始通过计费策略遍历解析每个时段的费用明细
+ String start_time = vo.getStart_time();
+ String end_time = vo.getEnd_time();
+ long start = sdfs.parse(start_time).getTime();
+ long end = sdfs.parse(end_time).getTime();
+ Class<? extends TransactionRecordMessageVO> clazz = vo.getClass();
+ /**
+ * "start_time": "2025-01-03 23:06:43.00",
+ * "end_time": "2025-01-04 00:39:39.00",
+ */
+ for (int i = accountingStrategyDetailOrderList.size(); i > 0; i--) {
+ AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.get(i - 1);
+ long time = sdfs.parse(start_time.split(" ")[0] + " " + strategyDetail.getEndTime() + ":00").getTime();
+ if(time < start){
break;
- case 2:
- //充电度数
- invoke = clazz.getMethod("getPeak_charge" + (i + 1)).invoke(vo);
- break;
- case 3:
- //充电度数
- invoke = clazz.getMethod("getFlat_charge" + (i + 1)).invoke(vo);
- break;
- case 4:
- //充电度数
- invoke = clazz.getMethod("getValley_charge" + (i + 1)).invoke(vo);
- break;
+ }
+ //阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）
+ Object invoke = null;
+ switch (strategyDetail.getType()){
+ case 1:
+ //充电度数
+ invoke = clazz.getMethod("getSpike_charge" + (i)).invoke(vo);
+ break;
+ case 2:
+ //充电度数
+ invoke = clazz.getMethod("getPeak_charge" + (i)).invoke(vo);
+ break;
+ case 3:
+ //充电度数
+ invoke = clazz.getMethod("getFlat_charge" + (i)).invoke(vo);
+ break;
+ case 4:
+ //充电度数
+ invoke = clazz.getMethod("getValley_charge" + (i)).invoke(vo);
+ break;
+ }
+ if(null == invoke || Double.valueOf(invoke.toString()) == 0){
+ continue;
+ }
+ BigDecimal sharp_peak_charge = new BigDecimal(invoke.toString());
+ AccountingStrategyDetailOrderVo vo1 = new AccountingStrategyDetailOrderVo();
+ BeanUtils.copyProperties(strategyDetail, vo1);
+ vo1.setChargingCapacity(sharp_peak_charge);
+ lists.add(0, vo1);
}
- if(null == invoke || Double.valueOf(invoke.toString()) == 0){
- continue;
+
+ //第二天的
+ //开始通过计费策略遍历解析每个时段的费用明细
+ for (int i = 0; i < accountingStrategyDetailOrderList.size(); i++) {
+ AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.get(i);
+ long time = sdfs.parse(end_time.split(" ")[0] + " " + strategyDetail.getStartTime() + ":00").getTime();
+ if(time > end){
+ break;
+ }
+ //阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）
+ Object invoke = null;
+ switch (strategyDetail.getType()){
+ case 1:
+ //充电度数
+ invoke = clazz.getMethod("getSpike_charge" + (i + 1)).invoke(vo);
+ break;
+ case 2:
+ //充电度数
+ invoke = clazz.getMethod("getPeak_charge" + (i + 1)).invoke(vo);
+ break;
+ case 3:
+ //充电度数
+ invoke = clazz.getMethod("getFlat_charge" + (i + 1)).invoke(vo);
+ break;
+ case 4:
+ //充电度数
+ invoke = clazz.getMethod("getValley_charge" + (i + 1)).invoke(vo);
+ break;
+ }
+ if(null == invoke || Double.valueOf(invoke.toString()) == 0){
+ continue;
+ }
+ BigDecimal sharp_peak_charge = new BigDecimal(invoke.toString());
+ AccountingStrategyDetailOrderVo vo1 = new AccountingStrategyDetailOrderVo();
+ BeanUtils.copyProperties(strategyDetail, vo1);
+ vo1.setChargingCapacity(sharp_peak_charge);
+ lists.add(vo1);
}
- BigDecimal sharp_peak_charge = new BigDecimal(invoke.toString());
- AccountingStrategyDetailOrderVo vo1 = new AccountingStrategyDetailOrderVo();
- BeanUtils.copyProperties(strategyDetail, vo1);
- vo1.setStart(sdfs.parse(vo.getStart_time().split(" ")[0] + " " + strategyDetail.getStartTime() + ":00").getTime());
- vo1.setEnd(sdfs.parse(vo.getStart_time().split(" ")[0] + " " + strategyDetail.getEndTime() + ":00").getTime());
- vo1.setChargingCapacity(sharp_peak_charge);
- lists.add(vo1);
- } catch (IllegalAccessException e) {
- throw new RuntimeException(e);
- } catch (InvocationTargetException e) {
- throw new RuntimeException(e);
- } catch (NoSuchMethodException e) {
- throw new RuntimeException(e);
- } catch (ParseException e) {
- throw new RuntimeException(e);
+ }else{
+ for (int i = 0; i < accountingStrategyDetailOrderList.size(); i++) {
+ Class<? extends TransactionRecordMessageVO> clazz = vo.getClass();
+ AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.get(i);
+ //阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）
+ Object invoke = null;
+ switch (strategyDetail.getType()){
+ case 1:
+ //充电度数
+ invoke = clazz.getMethod("getSpike_charge" + (i + 1)).invoke(vo);
+ break;
+ case 2:
+ //充电度数
+ invoke = clazz.getMethod("getPeak_charge" + (i + 1)).invoke(vo);
+ break;
+ case 3:
+ //充电度数
+ invoke = clazz.getMethod("getFlat_charge" + (i + 1)).invoke(vo);
+ break;
+ case 4:
+ //充电度数
+ invoke = clazz.getMethod("getValley_charge" + (i + 1)).invoke(vo);
+ break;
+ }
+ if(null == invoke || Double.valueOf(invoke.toString()) == 0){
+ continue;
+ }
+ BigDecimal sharp_peak_charge = new BigDecimal(invoke.toString());
+ AccountingStrategyDetailOrderVo vo1 = new AccountingStrategyDetailOrderVo();
+ BeanUtils.copyProperties(strategyDetail, vo1);
+ vo1.setChargingCapacity(sharp_peak_charge);
+ lists.add(vo1);
+ }
}
- }
- Collections.sort(lists, new Comparator<AccountingStrategyDetailOrderVo>() {
- public int compare(AccountingStrategyDetailOrderVo s1, AccountingStrategyDetailOrderVo s2) {
- return s1.getStart() < s2.getStart() ? -1 : s1.getStart() == s2.getStart() ? 0 : 1;
- }
- });
- if(!vo.getStart_time().split(" ")[0].equals(vo.getEnd_time().split(" ")[0])){
- List<AccountingStrategyDetailOrderVo> list1 = new ArrayList<>(lists);
- for (AccountingStrategyDetailOrderVo orderVo : list1) {
- Calendar start = Calendar.getInstance();
- start.setTimeInMillis(orderVo.getStart());
- start.set(Calendar.DAY_OF_YEAR, start.get(Calendar.DAY_OF_YEAR) + 1);
- orderVo.setStart(start.getTimeInMillis());
- Calendar end = Calendar.getInstance();
- end.setTimeInMillis(orderVo.getEnd());
- end.set(Calendar.DAY_OF_YEAR, end.get(Calendar.DAY_OF_YEAR) + 1);
- orderVo.setEnd(end.getTimeInMillis());
- }
- lists.addAll(list1);
+ }catch (Exception e){
+ e.printStackTrace();
+ R.fail("处理失败");
}
//开始处理明细
- SimpleDateFormat sdf3 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SS");
- SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm");
- Date start = null;
- Date end = null;
- try {
- start = sdf3.parse(vo.getStart_time());
- end = sdf3.parse(vo.getEnd_time());
- } catch (ParseException e) {
- throw new RuntimeException(e);
- }
-
- for (AccountingStrategyDetailOrderVo strategyDetail : lists) {
+ for (int i = 0; i < lists.size(); i++) {
+ AccountingStrategyDetailOrderVo strategyDetail = lists.get(i);
BigDecimal sharp_peak_charge = strategyDetail.getChargingCapacity();
TChargingOrderAccountingStrategy chargingOrderAccountingStrategy = new TChargingOrderAccountingStrategy();
chargingOrderAccountingStrategy.setChargingOrderId(chargingOrder.getId());
@@ -1916,100 +2350,83 @@
chargingOrderAccountingStrategy.setElectrovalence(strategyDetail.getElectrovalence());
chargingOrderAccountingStrategy.setServiceCharge(strategyDetail.getServiceCharge());
chargingOrderAccountingStrategy.setCostServiceCharge(strategyDetail.getCostServiceCharge());
-
- if(start.getTime() >= strategyDetail.getStart()){
- chargingOrderAccountingStrategy.setStartTime(sdf2.format(start));
+ if(i == 0){
+ String time = vo.getStart_time().split(" ")[1];
+ chargingOrderAccountingStrategy.setStartTime(time.substring(0, time.lastIndexOf(":")));
}else{
chargingOrderAccountingStrategy.setStartTime(strategyDetail.getStartTime());
}
- if(end.getTime() >= strategyDetail.getEnd()){
- chargingOrderAccountingStrategy.setEndTime(strategyDetail.getEndTime());
+ if(i == lists.size() - 1){
+ String time = vo.getEnd_time().split(" ")[1];
+ chargingOrderAccountingStrategy.setEndTime(time.substring(0, time.lastIndexOf(":")));
}else{
- chargingOrderAccountingStrategy.setEndTime(sdf2.format(end));
+ chargingOrderAccountingStrategy.setEndTime(strategyDetail.getEndTime());
}
//已充电总度数
- BigDecimal electrovalenc = strategyDetail.getElectrovalence().multiply(sharp_peak_charge).setScale(2, RoundingMode.HALF_EVEN);
- BigDecimal originalServicePrice = strategyDetail.getServiceCharge().multiply(sharp_peak_charge).setScale(2, RoundingMode.HALF_EVEN);
+ BigDecimal electrovalenc = strategyDetail.getElectrovalence().multiply(sharp_peak_charge);
+ BigDecimal originalServicePrice = strategyDetail.getServiceCharge().multiply(sharp_peak_charge);
BigDecimal serviceCharge = originalServicePrice;
BigDecimal vipDiscountAmount = BigDecimal.ZERO;
//计算优惠金额
if(null != chargingOrder.getVipDiscount()){
- vipDiscountAmount = serviceCharge.multiply(new BigDecimal(1).subtract(chargingOrder.getVipDiscount())).setScale(2, RoundingMode.HALF_EVEN);
- serviceCharge = serviceCharge.multiply(chargingOrder.getVipDiscount()).setScale(2, RoundingMode.HALF_EVEN);
+ //0.58折
+ vipDiscountAmount = serviceCharge.multiply(new BigDecimal(1).subtract(chargingOrder.getVipDiscount()));
+ serviceCharge = serviceCharge.multiply(chargingOrder.getVipDiscount());
}
chargingOrderAccountingStrategy.setChargingCapacity(sharp_peak_charge);
- chargingOrderAccountingStrategy.setPeriodElectricPrice(electrovalenc);
- chargingOrderAccountingStrategy.setPeriodServicePrice(serviceCharge);
- chargingOrderAccountingStrategy.setPeriodOriginalServicePrice(originalServicePrice);
- chargingOrderAccountingStrategy.setVipDiscountAmount(vipDiscountAmount);
+ chargingOrderAccountingStrategy.setPeriodElectricPrice(electrovalenc.setScale(4, RoundingMode.HALF_EVEN));
+ chargingOrderAccountingStrategy.setPeriodServicePrice(serviceCharge.setScale(4, RoundingMode.HALF_EVEN));
+ chargingOrderAccountingStrategy.setPeriodOriginalServicePrice(originalServicePrice.setScale(4, RoundingMode.HALF_EVEN));
+ chargingOrderAccountingStrategy.setVipDiscountAmount(vipDiscountAmount.setScale(4, RoundingMode.HALF_EVEN));
chargingOrderAccountingStrategy.setCreateTime(LocalDateTime.now());
chargingOrderAccountingStrategyService.save(chargingOrderAccountingStrategy);
-
+ //电费
periodElectricPrice_total = periodElectricPrice_total.add(electrovalenc);
+ //服务费（含折扣）
+ serviceCharge_total = serviceCharge_total.add(serviceCharge);
+ //服务费（不含折扣）
periodServicePrice_total = periodServicePrice_total.add(originalServicePrice);
+ //会员折扣优惠金额
+ vipDiscountAmount_total = vipDiscountAmount_total.add(vipDiscountAmount);
+ //原始总金额（不含折扣）
total = total.add(electrovalenc.add(originalServicePrice));
}
-
-
+ BigDecimal orderAmount = BigDecimal.valueOf(total.doubleValue());
//原金额
BigDecimal rechargeAmount = chargingOrder.getRechargeAmount();
- BigDecimal vipDiscountAmount = chargingOrder.getVipDiscountAmount();
- //总金额（充值金额+会员折扣金额）
- BigDecimal decimal = rechargeAmount.add(vipDiscountAmount);
- //退款金额（已经计算了折扣优惠部分）
- //如果充电总金额未使用完，则需要退回费用=(原金额/总金额)*(总金额-实际充电金额)
- BigDecimal refundAmount = rechargeAmount.divide(decimal, new MathContext(4, RoundingMode.HALF_EVEN)).multiply(decimal.subtract(total));
- BigDecimal orderAmount = BigDecimal.valueOf(total.doubleValue());
- BigDecimal payAmount = BigDecimal.valueOf(total.doubleValue());
- //折扣金额
- BigDecimal discountAmount = BigDecimal.ZERO;
- if(null != chargingOrder.getVipDiscount()){
- TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
- //判断会员是否还有充电优惠次数
- GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
- getAppUserVipDetail.setAppUserId(chargingOrder.getAppUserId());
- getAppUserVipDetail.setVipId(appUser.getVipId());
- TAppUserVipDetail data = appUserVipDetailClient.getAppUserVipDetail(getAppUserVipDetail).getData();
- if(null != data && data.getChargeNum() > 0){
- data.setChargeNum(data.getChargeNum() - 1);
- appUserVipDetailClient.updateAppUserVipDetail(data);
-
- //服务费折扣
- discountAmount = periodServicePrice_total.multiply((new BigDecimal(1).subtract(chargingOrder.getVipDiscount())));
- TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
- BigDecimal maximumDeduction = vip.getMaximumDeduction();
- //普通会员有最高优惠限制
- if(vip.getType() == 1 && discountAmount.compareTo(maximumDeduction) > 0){
- discountAmount = maximumDeduction;
- }
- }
- }
- //会员折扣金额
- discountAmount = discountAmount.setScale(2, RoundingMode.HALF_EVEN);
- payAmount = payAmount.subtract(discountAmount);
- periodServicePrice_total = periodServicePrice_total.subtract(discountAmount);
-
+ //支付金额
+ BigDecimal payAmount = periodElectricPrice_total.add(serviceCharge_total);
+ //退款金额=充值金额-实际支付金额
+ BigDecimal refundAmount = rechargeAmount.subtract(payAmount);
+
TChargingOrder order = new TChargingOrder();
order.setId(chargingOrder.getId());
order.setAppUserId(chargingOrder.getAppUserId());
UploadRealTimeMonitoringData uploadRealTimeMonitoringData = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
if(null != uploadRealTimeMonitoringData && null == chargingOrder.getEndMode()){
Integer soc = uploadRealTimeMonitoringData.getSoc();
- order.setEndMode(soc > 98 ? 2 : 3);
- }else{
- order.setEndMode(1);
+ if(soc >= 98){
+ order.setEndMode(2);
+ }else if(chargingOrder.getResidualAmount().compareTo(new BigDecimal(1)) <= 0){
+ order.setEndMode(3);
+ }else{
+ order.setEndMode(0);
+ }
}
order.setResidualAmount(rechargeAmount.subtract(total).setScale(2, RoundingMode.HALF_EVEN));
order.setStartTime(LocalDateTime.parse(vo.getStart_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS")));
order.setEndTime(LocalDateTime.parse(vo.getEnd_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS")));
order.setStatus(5);
order.setOrderAmount(orderAmount.setScale(2, RoundingMode.HALF_EVEN));
- order.setVipDiscountAmount(discountAmount);
order.setElectrovalence(periodElectricPrice_total.setScale(2, RoundingMode.HALF_EVEN));
order.setChargingCapacity(vo.getTotal_electricity());
order.setElectricity(vo.getTotal_electricity());
+ order.setVipDiscountAmount(vipDiscountAmount_total);
+ if(vipDiscountAmount_total.compareTo(BigDecimal.ZERO) == 0){
+ order.setVipDiscount(BigDecimal.valueOf(1));
+ }
//计算优惠券
BigDecimal couponDiscount = BigDecimal.ZERO;
@@ -2024,9 +2441,9 @@
if(payAmount.compareTo(tCoupon.getMeetTheConditions()) >= 0){
BigDecimal couponDiscountAmount = tCoupon.getDiscountAmount();
//如果优惠金额大于服务费金额，以服务费作为最大限制
- if(periodServicePrice_total.compareTo(couponDiscountAmount) < 0){
- couponDiscount = periodServicePrice_total;
- periodServicePrice_total = BigDecimal.ZERO;
+ if(serviceCharge_total.compareTo(couponDiscountAmount) < 0){
+ couponDiscount = serviceCharge_total;
+ serviceCharge_total = BigDecimal.ZERO;
}else{
couponDiscount = couponDiscountAmount;
}
@@ -2045,9 +2462,9 @@
BigDecimal divide = payAmount.multiply(new BigDecimal(10).subtract(tCoupon.getDiscount())).divide(new BigDecimal(10));
divide = divide.compareTo(tCoupon.getMaximumDiscountAmount()) > 0 ? tCoupon.getMaximumDiscountAmount() : divide;
//如果优惠金额大于服务费金额，以服务费作为最大限制
- if(periodServicePrice_total.compareTo(divide) < 0){
- couponDiscount = periodServicePrice_total;
- periodServicePrice_total = BigDecimal.ZERO;
+ if(serviceCharge_total.compareTo(divide) < 0){
+ couponDiscount = serviceCharge_total;
+ serviceCharge_total = BigDecimal.ZERO;
}else{
couponDiscount = divide;
}
@@ -2062,19 +2479,35 @@
}
}
//优惠券优惠金额
- couponDiscount = couponDiscount.setScale(2, RoundingMode.HALF_EVEN);
+ couponDiscount = couponDiscount.setScale(4, RoundingMode.HALF_EVEN);
+ //退款金额+优惠券
refundAmount = refundAmount.add(couponDiscount);
+ //实际支付金额-优惠券
payAmount = payAmount.subtract(couponDiscount);
- if(periodServicePrice_total.compareTo(BigDecimal.ZERO) > 0){
- periodServicePrice_total = periodServicePrice_total.subtract(couponDiscount);
+ if(serviceCharge_total.compareTo(BigDecimal.ZERO) > 0){
+ serviceCharge_total = serviceCharge_total.subtract(couponDiscount);
}
- order.setCouponDiscountAmount(couponDiscount);
- order.setServiceCharge(periodServicePrice_total.setScale(2, RoundingMode.HALF_EVEN));
+ order.setCouponDiscountAmount(couponDiscount.setScale(2, RoundingMode.HALF_EVEN));
+ order.setServiceCharge(serviceCharge_total.setScale(2, RoundingMode.HALF_EVEN));
order.setPaymentAmount(payAmount.setScale(2, RoundingMode.HALF_EVEN));
order.setRefundAmount(refundAmount.setScale(2, RoundingMode.HALF_EVEN));
order.setRefundStatus(1);
this.updateById(order);
chargingOrder = this.getById(order.getId());
+
+ //推送三方平台
+ if(2 == chargingOrder.getOrderSource()){
+ TChargingOrder finalChargingOrder = chargingOrder;
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ tcecClient.notificationEquipChargeStatus(finalChargingOrder.getStartChargeSeq(), finalChargingOrder.getOperatorId());
+ tcecClient.notificationStopChargeResult(finalChargingOrder.getStartChargeSeq(), finalChargingOrder.getChargingGunId().toString(),
+ finalChargingOrder.getOperatorId());
+ tcecClient.notificationChargeOrderInfo(finalChargingOrder.getStartChargeSeq(), finalChargingOrder.getOperatorId());
+ }
+ }).start();
+ }
//开始将优惠券优惠的金额添加到明细中
BigDecimal couponDiscountAmount = order.getCouponDiscountAmount();
@@ -2097,99 +2530,146 @@
chargingGun.setStatus(2);
chargingGun.setChargingPower(BigDecimal.ZERO);
chargingGunClient.updateChargingGunById(chargingGun);
+ //推送状态给三方平台
+ if(2 == chargingOrder.getOrderSource()){
+ tcecClient.pushChargingGunStatus(chargingGun.getFullNumber(), chargingGun.getStatus());
+ }
//添加积分
- TIntegralRule integralRule = integralRuleClient.getSet().getData();
- if(null != integralRule){
- TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
- Integer num1 = JSON.parseObject(integralRule.getChargeCredit()).getInteger("num1");
- Integer integral = chargingOrder.getServiceCharge().intValue() * num1;
- if(null != appUser.getVipId()){
- TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
- Integer doubleIntegration = vip.getDoubleIntegration();
- //双倍积分
- if(1 == doubleIntegration){
- integral *= 2;
- }
- }
-
- if(integral > 0){
- TAppUserIntegralChange appUserIntegralChange = new TAppUserIntegralChange();
- appUserIntegralChange.setAppUserId(appUser.getId());
- appUserIntegralChange.setChangeType(2);
- appUserIntegralChange.setHistoricalIntegral(appUser.getPoints());
- appUser.setPoints(appUser.getPoints() + integral);
- appUserIntegralChange.setCurrentIntegral(appUser.getPoints());
- appUserIntegralChange.setCreateTime(LocalDateTime.now());
- appUserIntegralChange.setOrderCode(chargingOrder.getCode());
- appUserIntegralChange.setExtension(chargingOrder.getId().toString());
- appUserClient.updateAppUser(appUser);
- appUserIntegralChangeClient.addAppUserIntegralChange(appUserIntegralChange);
- }
- }
-
- //计算用户标签
- editUserTag(chargingOrder);
- //用户推荐奖励
- referralReward(chargingOrder);
-
- //开始构建退款费用
- if(refundAmount.compareTo(BigDecimal.ZERO) > 0){
- Integer rechargePaymentType = chargingOrder.getRechargePaymentType();
- //构建退款明细
- TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
- chargingOrderRefund.setChargingOrderId(chargingOrder.getId());
- SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
- chargingOrderRefund.setRefundCode("CDF" + sdf.format(new Date()) + (Double.valueOf(Math.random() * 1000).intValue()));
- chargingOrderRefund.setRefundAmount(refundAmount);
- chargingOrderRefund.setRefundStatus(1);
- chargingOrderRefund.setPayType(rechargePaymentType);
- chargingOrderRefund.setRefundStatus(1);
- chargingOrderRefund.setCode(chargingOrder.getCode());
- chargingOrderRefund.setRefundTitle("充电完成退款");
- chargingOrderRefund.setRefundContent("充电完成退款");
- chargingOrderRefund.setRefundReason("充电完成退款");
- chargingOrderRefund.setRefundRemark("实际充电消费金额：" + chargingOrder.getPaymentAmount());
- chargingOrderRefund.setRefundTotalAmount(refundAmount);
- chargingOrderRefund.setPayAmount(rechargeAmount);
- if(1 == rechargePaymentType){
- WxPaymentRefundModel model = new WxPaymentRefundModel();
- model.setOut_trade_no(chargingOrder.getCode());
- model.setOut_refund_no(chargingOrderRefund.getRefundCode());
- model.setReason("充电完成退款");
- model.setNotify_url("/payment/wx/refund/notify");
- WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
- amount.setRefund(refundAmount.multiply(new BigDecimal(100)).intValue());
- amount.setTotal(rechargeAmount.multiply(new BigDecimal(100)).intValue());
- amount.setCurrency("CNY");
- model.setAmount(amount);
- R<String> orderR = wxPaymentClient.refundOrderR(model);
- if(200 == orderR.getCode()){
- chargingOrderRefundService.save(chargingOrderRefund);
- }
- }
- if(2 == rechargePaymentType){
- RefundReq dto = new RefundReq();
- dto.setOutTradeNo(chargingOrder.getCode());
- dto.setOutRequestNo(chargingOrderRefund.getCode());
- dto.setRefundAmount(refundAmount.toString());
- dto.setRefundReason("充电完成退款");
- RefundResp resp = aliPaymentClient.refund(dto).getData();
- if(null != resp){
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-DDTHH:mm:ss+TIMEZONE");
- AjaxResult success = chargingOrderStartupFailureWxRefund(resp.getOutTradeNo(), resp.getTradeNo(), "SUCCESS", sdf1.format(new Date()));
- if(success.isSuccess()){
- chargingOrderRefundService.save(chargingOrderRefund);
+ if(1 == chargingOrder.getOrderSource()){
+ TIntegralRule integralRule = integralRuleClient.getSet().getData();
+ if(null != integralRule){
+ TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
+ Integer num1 = JSON.parseObject(integralRule.getChargeCredit()).getInteger("num1");
+ Integer integral = chargingOrder.getServiceCharge().intValue() * num1;
+ if(null != appUser.getVipId()){
+ TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
+ Integer doubleIntegration = vip.getDoubleIntegration();
+ //双倍积分
+ if(1 == doubleIntegration){
+ integral *= 2;
}
}
+
+ if(integral > 0){
+ TAppUserIntegralChange appUserIntegralChange = new TAppUserIntegralChange();
+ appUserIntegralChange.setAppUserId(appUser.getId());
+ appUserIntegralChange.setChangeType(2);
+ appUserIntegralChange.setHistoricalIntegral(appUser.getPoints());
+ appUser.setPoints(appUser.getPoints() + integral);
+ appUserIntegralChange.setCurrentIntegral(appUser.getPoints());
+ appUserIntegralChange.setCreateTime(LocalDateTime.now());
+ appUserIntegralChange.setOrderCode(chargingOrder.getCode());
+ appUserIntegralChange.setExtension(chargingOrder.getId().toString());
+ appUserClient.updateAppUser(appUser);
+ appUserIntegralChangeClient.addAppUserIntegralChange(appUserIntegralChange);
+ }
}
+ //计算用户标签
+ editUserTag(chargingOrder);
+ //用户推荐奖励
+ referralReward(chargingOrder);
+
+ //开始构建退款费用
+ refundAmount = refundAmount.setScale(2, RoundingMode.HALF_EVEN);
+ if(refundAmount.compareTo(BigDecimal.ZERO) > 0){
+ Integer rechargePaymentType = chargingOrder.getRechargePaymentType();
+ //构建退款明细
+ TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
+ chargingOrderRefund.setChargingOrderId(chargingOrder.getId());
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ chargingOrderRefund.setRefundCode("CDF" + sdf.format(new Date()) + (Double.valueOf(Math.random() * 1000).intValue()));
+ chargingOrderRefund.setRefundAmount(refundAmount);
+ chargingOrderRefund.setRefundStatus(1);
+ chargingOrderRefund.setPayType(rechargePaymentType);
+ chargingOrderRefund.setRefundStatus(1);
+ chargingOrderRefund.setCode(chargingOrder.getCode());
+ chargingOrderRefund.setRefundTitle("充电完成退款");
+ chargingOrderRefund.setRefundContent("充电完成退款");
+ chargingOrderRefund.setRefundReason("充电完成退款");
+ chargingOrderRefund.setRefundRemark("实际充电消费金额：" + chargingOrder.getPaymentAmount());
+ chargingOrderRefund.setRefundTotalAmount(refundAmount);
+ chargingOrderRefund.setPayAmount(rechargeAmount);
+ if(1 == rechargePaymentType){
+ WxPaymentRefundModel model = new WxPaymentRefundModel();
+ model.setOut_trade_no(chargingOrder.getCode());
+ model.setOut_refund_no(chargingOrderRefund.getRefundCode());
+ model.setReason("充电完成退款");
+ model.setNotify_url("/payment/wx/refund/notify");
+ WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
+ amount.setRefund(refundAmount.multiply(new BigDecimal(100)).intValue());
+ amount.setTotal(rechargeAmount.multiply(new BigDecimal(100)).intValue());
+ amount.setCurrency("CNY");
+ model.setAmount(amount);
+ R<Map<String, Object>> result = wxPaymentClient.refundOrderR(model);
+ if(200 == result.getCode()){
+ chargingOrderRefundService.save(chargingOrderRefund);
+ //手续费
+ Map<String, Object> amount1 = (Map<String, Object>) result.getData().get("amount");
+ Object refund_fee1 = amount1.get("refund_fee");
+ BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));
+ chargingOrderRefund.setRefundFee(refund_fee);
+ chargingOrderRefundService.updateById(chargingOrderRefund);
+ }
+ }
+ if(2 == rechargePaymentType){
+ RefundReq dto = new RefundReq();
+ dto.setOutTradeNo(chargingOrder.getCode());
+ dto.setOutRequestNo(chargingOrderRefund.getRefundCode());
+ dto.setRefundAmount(refundAmount.toString());
+ dto.setRefundReason("充电完成退款");
+ RefundResp resp = aliPaymentClient.refund(dto).getData();
+ if(null != resp){
+ chargingOrderRefundService.save(chargingOrderRefund);
+ this.chargingOrderStartupFailureWxRefund(chargingOrderRefund.getRefundCode(), resp.getTradeNo(), "SUCCESS", null);
+ }
+ }
+
+ }
}
+
+ //添加汇总统计数据
+ List<TChargingOrderAccountingStrategy> list4 = chargingOrderAccountingStrategyService.list(new QueryWrapper<TChargingOrderAccountingStrategy>().eq("charging_order_id", chargingOrder.getId()));
+ BigDecimal electronic_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal service_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal chargingCapacity = list4.stream().map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal serviceMoney = BigDecimal.ZERO;
+ BigDecimal paymentMoney = BigDecimal.ZERO;
+ long time = 0;
+ if (!chargingOrder.getOrderSource().equals(2)) {
+ serviceMoney = serviceMoney.add(service_reduce);
+ paymentMoney = paymentMoney.add(electronic_reduce).add(service_reduce);
+ }else{
+ serviceMoney = serviceMoney.add(service_reduce.multiply(new BigDecimal("0.8")));
+ paymentMoney = paymentMoney.add(electronic_reduce).add(service_reduce.multiply(new BigDecimal("0.8")));
+ }
+ if (chargingOrder.getStartTime()!=null && chargingOrder.getEndTime()!=null){
+ LocalDateTime startTime = chargingOrder.getStartTime();
+ LocalDateTime endTime = chargingOrder.getEndTime();
+ // 计算时间差 单位秒
+ time = ChronoUnit.SECONDS.between(startTime, endTime);
+ }
+ TChargingOrderSummaryData summaryData = new TChargingOrderSummaryData();
+ summaryData.setChargingOrderId(chargingOrder.getId());
+ summaryData.setChargingCapacity(chargingCapacity);
+ summaryData.setChargingDuration(time);
+ summaryData.setIncome(paymentMoney.setScale(2, BigDecimal.ROUND_HALF_EVEN));
+ summaryData.setElectricPrice(electronic_reduce.setScale(2, BigDecimal.ROUND_HALF_EVEN));
+ summaryData.setServicePrice(serviceMoney.setScale(2, BigDecimal.ROUND_HALF_EVEN));
+ chargingOrderSummaryDataService.save(summaryData);
+ return R.ok();
}
+
+
+
@Override
- public List<Map<String, Object>> getByDate(List<Long> chargingOrderIds) {
- return this.baseMapper.getByDate(chargingOrderIds);
+ public List<Map<String, Object>> getByDate(LocalDate start,LocalDate end,List<Integer> siteIds) {
+
+ LocalDateTime start1 = start.atStartOfDay();
+ LocalDateTime end1 = end.atTime(LocalTime.MAX);
+ return this.baseMapper.getByDate(start1,end1,siteIds);
}
@Override
@@ -2202,14 +2682,11 @@
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();
+ public List<Map<String, Object>> usersDay(ChargingStatisticsQueryDto statisticsQueryDto) {
+ return this.baseMapper.usersDay(statisticsQueryDto);
}
@Override
@@ -2275,6 +2752,10 @@
private TVipOrderService vipOrderService;
@Resource
private TVipOrderRefundService vipOrderRefundService;
+
+
+
+
@Override
public R payRefund(PayOrderRefundDto payOrderQueryDto) {
if (payOrderQueryDto.getType()==1){
@@ -2315,12 +2796,18 @@
amount.setTotal(tChargingOrder.getRechargeAmount().multiply(new BigDecimal(100)).intValue());
amount.setCurrency("CNY");
model.setAmount(amount);
- R<String> orderR = wxPaymentClient.refundOrderR(model);
+ R<Map<String, Object>> orderR = wxPaymentClient.refundOrderR(model);
if(200 == orderR.getCode()){
tChargingOrder.setRefundStatus(2);
tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
this.baseMapper.updateById(tChargingOrder);
chargingOrderRefundService.save(chargingOrderRefund);
+ //手续费
+ Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
+ Object refund_fee1 = amount1.get("refund_fee");
+ BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));
+ chargingOrderRefund.setRefundFee(refund_fee);
+ chargingOrderRefundService.updateById(chargingOrderRefund);
}
}
@@ -2332,7 +2819,6 @@
dto.setRefundReason("取消订单");
RefundResp resp = aliPaymentClient.refund(dto).getData();
if(null != resp){
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-DDTHH:mm:ss+TIMEZONE");
chargingOrderRefund.setRefundStatus(2);
chargingOrderRefund.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
this.baseMapper.updateById(tChargingOrder);
@@ -2340,11 +2826,6 @@
}
}
-
-
-
-
-
}
if (payOrderQueryDto.getType()==2){
TShoppingOrder tChargingOrder = shoppingOrderService.getById(payOrderQueryDto.getOrderId());
@@ -2383,12 +2864,18 @@
amount.setTotal(tChargingOrder.getPaymentAmount().multiply(new BigDecimal(100)).intValue());
amount.setCurrency("CNY");
model.setAmount(amount);
- R<String> orderR = wxPaymentClient.refundOrderR(model);
+ R<Map<String, Object>> orderR = wxPaymentClient.refundOrderR(model);
if(200 == orderR.getCode()){
tChargingOrder.setRefundStatus(2);
tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
shoppingOrderService.updateById(tChargingOrder);
shoppingOrderRefundService.save(chargingOrderRefund);
+ //手续费
+ Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
+ Object refund_fee1 = amount1.get("refund_fee");
+ BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));
+ chargingOrderRefund.setRefundFee(refund_fee);
+ shoppingOrderRefundService.updateById(chargingOrderRefund);
}
}
@@ -2400,16 +2887,10 @@
dto.setRefundReason("取消订单");
RefundResp resp = aliPaymentClient.refund(dto).getData();
if(null != resp){
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-DDTHH:mm:ss+TIMEZONE");
-
tChargingOrder.setRefundStatus(2);
tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
-
-
shoppingOrderService.updateById(tChargingOrder);
-
shoppingOrderRefundService.save(chargingOrderRefund);
-
}
}
@@ -2420,8 +2901,6 @@
if (tChargingOrder.getPaymentAmount().compareTo(payOrderQueryDto.getRefundAmount())==-1){
return R.fail("退款金额需小于支付金额");
}
-
-
TVipOrderRefund chargingOrderRefund = new TVipOrderRefund();
chargingOrderRefund.setVipOrderId(tChargingOrder.getId());
chargingOrderRefund.setRefundAmount(payOrderQueryDto.getRefundAmount());
@@ -2450,12 +2929,18 @@
amount.setTotal(tChargingOrder.getPaymentAmount().multiply(new BigDecimal(100)).intValue());
amount.setCurrency("CNY");
model.setAmount(amount);
- R<String> orderR = wxPaymentClient.refundOrderR(model);
+ R<Map<String, Object>> orderR = wxPaymentClient.refundOrderR(model);
if(200 == orderR.getCode()){
tChargingOrder.setRefundStatus(2);
tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
vipOrderService.updateById(tChargingOrder);
vipOrderRefundService.save(chargingOrderRefund);
+ //手续费
+ Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
+ Object refund_fee1 = amount1.get("refund_fee");
+ BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));
+ chargingOrderRefund.setRefundFee(refund_fee);
+ vipOrderRefundService.updateById(chargingOrderRefund);
}
}
@@ -2467,23 +2952,13 @@
dto.setRefundReason("取消订单");
RefundResp resp = aliPaymentClient.refund(dto).getData();
if(null != resp){
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-DDTHH:mm:ss+TIMEZONE");
-
tChargingOrder.setRefundStatus(2);
tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
-
-
vipOrderService.updateById(tChargingOrder);
-
vipOrderRefundService.save(chargingOrderRefund);
-
}
}
-
}
-
-
-
return R.ok();
}
@@ -2495,11 +2970,7 @@
*/
@Override
public TChargingOrder getChargingOrderByLicensePlate(GetChargingOrderByLicensePlate query) {
- TAppUserCar appUserCar = appUserCarClient.getAppUserCarByLicensePlate(query.getLicensePlate()).getData();
- if(null == appUserCar){
- return null;
- }
- TChargingOrder one = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getAppUserCarId, appUserCar.getId())
+ TChargingOrder one = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getPlateNum, query.getLicensePlate())
.eq(TChargingOrder::getDelFlag, 0).between(TChargingOrder::getStartTime, query.getStartTime(), LocalDateTime.now())
.eq(TChargingOrder::getRechargePaymentStatus, 2).in(TChargingOrder::getStatus, Arrays.asList(4, 5)));
return one;
@@ -2508,6 +2979,8 @@
@Override
public TSettlementConfirm settlementAdd(SettlementConfirmAdd dto) {
List<Site> data = siteClient.getSiteByIds(Arrays.asList(dto.getSiteId())).getData();
+ List<TChargingOrderAccountingStrategy> list3 = chargingOrderAccountingStrategyService.list();
+
TSettlementConfirm tSettlementConfirm = new TSettlementConfirm();
if (!data.isEmpty()){
tSettlementConfirm.setSiteName(data.get(0).getName());
@@ -2534,12 +3007,10 @@
// 根据站点id和开始时间和结束时间和归属日期 查询充电订单列表
QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
- .eq("site_id", dto.getSiteId())
- .eq("status", 5)
- .eq("recharge_payment_status",2);
+ .eq("site_id", dto.getSiteId());
switch (dto.getType()){
case 1:
- eq.between("start_time", localDateTime, localDateTime1);
+ eq.between("pay_time", localDateTime, localDateTime1);
break;
case 2:
eq.between("end_time", localDateTime, localDateTime1);
@@ -2565,23 +3036,38 @@
// 支付订单金额 需要减去退款金额
BigDecimal paymentAmount = new BigDecimal("0");
for (TChargingOrder tChargingOrder : tChargingOrders) {
- // 累加充电总度数
- if (tChargingOrder.getChargingCapacity()!=null){
- chargingElectronic = chargingElectronic.add(tChargingOrder.getChargingCapacity());
-
+ if(null == tChargingOrder.getStatus() || 5 != tChargingOrder.getStatus()){
+ continue;
}
+ List<TChargingOrderAccountingStrategy> list4 = list3.stream().filter(e -> e.getChargingOrderId().equals(tChargingOrder.getId())).collect(Collectors.toList());
+ BigDecimal electronic_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal service_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal chargingCapacity = list4.stream().map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ // 累加充电总度数
+ chargingElectronic = chargingElectronic.add(chargingCapacity);
// 累加分佣
- if (tChargingOrder.getSharingAmount()!=null) {
- sharingAmount = sharingAmount.add(tChargingOrder.getSharingAmount());
+ if (tChargingOrder.getOrderSource()==2) {
+ sharingAmount = sharingAmount.add(service_reduce.multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
}
// 累加电费
- if (tChargingOrder.getElectrovalence()!=null) {
- electrovalence = electrovalence.add(tChargingOrder.getElectrovalence());
+ electrovalence = electrovalence.add(electronic_reduce);
+ if (tChargingOrder.getPaymentAmount()!=null && tChargingOrder.getOrderSource()!=2){
+ paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
+
}
+ if (tChargingOrder.getRechargeAmount()!=null){
+ orderCommission = orderCommission.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006"))
+ .setScale(2,BigDecimal.ROUND_DOWN));
+ }
+
// 累加服务费
if (tChargingOrder.getServiceCharge()!=null){
- serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
-
+ if (tChargingOrder.getOrderSource()==2) {
+ serviceCharge = serviceCharge.add(service_reduce.multiply(new BigDecimal("0.8")).setScale(2,BigDecimal.ROUND_DOWN));
+ paymentAmount = paymentAmount.add(electronic_reduce).add(service_reduce.multiply(new BigDecimal("0.8")));
+ }else{
+ serviceCharge = serviceCharge.add(service_reduce);
+ }
}
// 累加会员折扣
if (tChargingOrder.getVipDiscountAmount()!=null){
@@ -2591,11 +3077,7 @@
if (tChargingOrder.getCouponDiscountAmount()!=null){
couponDiscount = couponDiscount.add(tChargingOrder.getCouponDiscountAmount());
}
- if (tChargingOrder.getPaymentAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
- orderCommission = orderCommission.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006"))
- .setScale(2,BigDecimal.ROUND_DOWN));
- }
+
}
@@ -2635,7 +3117,7 @@
BigDecimal subtract = new BigDecimal("1").subtract(dto.getProportionPartner());
BigDecimal subtract9 = new BigDecimal("1").subtract(dto.getServicePartner());
// 总电损费用
- BigDecimal divide = tSettlementConfirm.getProportionMoney().divide(subtract, 2, RoundingMode.HALF_DOWN);
+ BigDecimal divide = tSettlementConfirm.getProportionMoney().divide(subtract, 2, BigDecimal.ROUND_DOWN);
// 平台承担电损
BigDecimal subtract1 = divide.subtract(tSettlementConfirm.getProportionMoney());
BigDecimal multiply = dto.getServiceMoney().multiply(subtract);
@@ -2675,9 +3157,49 @@
}
dto.setStartTime(startTime);
dto.setEndTime(endTime);
+ Long userId = tokenService.getLoginUser().getUserid();
+ // 查询当前登陆人按钮权限
+ SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
+ Integer roleType = sysUser.getRoleType();
+ //如果没传siteId,获取当前登陆人所有的siteIds
+ List<Integer> siteIds = new ArrayList<>();
+ if (dto.getSiteIds()==null){
+ if (userId != null){
+ List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
+ for (GetSiteListDTO datum : data) {
+ siteIds.add(datum.getId());
+ }
+ }
+ }else {
+ siteIds.add(dto.getSiteIds());
+ }
+ if (siteIds.isEmpty()){
+ siteIds.add(-1);
+ }else{
+ if (roleType == 2){
+ List<Integer> integers = new ArrayList<>();
+ for (Integer siteId : siteIds) {
+ // 校验有没有这个站点的权限
+ List<Boolean> t1= partnerClient.getSettlementListMenu(sysUser.getObjectId(),siteId).getData();
+
+ Boolean b = t1.get(2);
+ if (b){
+ integers.add(siteId);
+ }
+ }
+ siteIds = integers;
+ }
+ }
+ dto.setSiteIdss(siteIds);
PageInfo<TSettlementConfirm> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
List<TSettlementConfirm> list = tSettlementConfirmMapper.settlementList(pageInfo,dto);
+
for (TSettlementConfirm tSettlementConfirm : list) {
+ if (roleType==2){
+ List<Boolean> data = partnerClient.getSettlementListMenu(sysUser.getObjectId(), tSettlementConfirm.getSiteId()).getData();
+ tSettlementConfirm.setAuthDownLoad(data.get(0));
+ tSettlementConfirm.setAuthDelete(data.get(1));
+ }
tSettlementConfirm.setUid(tSettlementConfirm.getId().toString());
List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(tSettlementConfirm.getSiteId())).getData();
if (!data1.isEmpty()){
@@ -2698,14 +3220,265 @@
return pageInfo;
}
+ @Autowired
+ private TChargingOrderService chargingOrderService;
@Override
public SettlementTotalVO settlementTotal(String time) {
+ Long userId = tokenService.getLoginUser().getUserid();
+ //如果没传siteId,获取当前登陆人所有的siteIds
+ List<Integer> siteIds = new ArrayList<>();
+ if (userId != null){
+ List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
+ for (GetSiteListDTO datum : data) {
+ siteIds.add(datum.getId());
+ }
+ }
+ if (siteIds.isEmpty()){
+ siteIds.add(-1);
+ }
+ List<Site> siteList = siteClient.getSiteAll().getData();
+ List<TChargingPile> pileList = chargingGunClient.getAllPile().getData();
+ List<TChargingOrder> totalOrder = chargingOrderService.list(new LambdaQueryWrapper<>(TChargingOrder.class)
+ .eq(TChargingOrder::getRechargePaymentStatus, 2).eq(TChargingOrder::getStatus, 5));
SettlementTotalVO res = new SettlementTotalVO();
- List<TSettlementConfirm> list1 = tSettlementConfirmMapper.settlementTotal(time);
+ List<TSettlementConfirm> list1 = tSettlementConfirmMapper.settlementTotal(time,siteIds);
LocalDateTime parse = LocalDateTime.parse(time, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
// 减少一个月
LocalDateTime minus = parse.minusMonths(1);
- List<TSettlementConfirm> list2 = tSettlementConfirmMapper.settlementTotal(time);
+ List<TSettlementConfirm> list2 = tSettlementConfirmMapper.settlementTotal(time,siteIds);
+ // 合计
+ 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.setElectronicRefund(0);
+ // 上月成本合计
+ BigDecimal beforeCost= new BigDecimal("0");
+ // 上月利润合计
+ BigDecimal beforeIncome= new BigDecimal("0");
+ int i = 1;
+ for (TSettlementConfirm tSettlementConfirm : list1) {
+ tSettlementConfirm.setXuhao(i);
+ tSettlementConfirm.setMetering(tSettlementConfirm.getSupplyElectronic());
+ Site site = siteList.stream().filter(e -> e.getId().equals(tSettlementConfirm.getSiteId())).findFirst().orElse(null);
+ if (site!=null){
+ tSettlementConfirm.setSiteName(site.getName());
+ }
+ if (tSettlementConfirm.getMeteringElectronic()!=null){
+ meteringElectronic = meteringElectronic.add(tSettlementConfirm.getMeteringElectronic());
+ chargingElectronic = chargingElectronic.add(tSettlementConfirm.getChargingElectronic());
+ }
+ if (tSettlementConfirm.getLossElectronic()!=null){
+ 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 = totalOrder.stream().filter(e-> e.getPayTime()
+ .isBefore(tSettlementConfirm.getEndTime())
+ && e.getPayTime().isAfter(tSettlementConfirm.getStartTime())&&e.getSiteId().equals(tSettlementConfirm.getSiteId())).collect(Collectors.toList());
+ // 充电总时长
+ Long temp = 0L;
+ for (TChargingOrder tChargingOrder : tChargingOrders) {
+ LocalDateTime startTime = tChargingOrder.getStartTime();
+ LocalDateTime endTime = tChargingOrder.getEndTime();
+ // 计算时间差 单位秒
+ long between = ChronoUnit.SECONDS.between(startTime, endTime);
+ temp+=between;
+ }
+ List<TChargingPile> data = siteClient.getPileListBySiteId(tSettlementConfirm.getSiteId()).getData();
+ // 计算充电桩的功率平均值
+ BigDecimal bigDecimal = new BigDecimal("0");
+ for (TChargingPile datum : data) {
+ bigDecimal = bigDecimal.add(datum.getRatedPower());
+ }
+
+ tSettlementConfirm.setIncome(tSettlementConfirm.getElectrovalence().add(tSettlementConfirm.getServiceCharge()));
+ //利用率=充电量/（桩数量*功率*时间）
+ List<TChargingPile> data2 = pileList.stream().filter(e -> e.getSiteId().equals(tSettlementConfirm.getSiteId())).collect(Collectors.toList());
+ BigDecimal bigDecimal2 = new BigDecimal("0");
+
+ if (data2!=null && (!data2.isEmpty())){
+ for (TChargingPile tChargingPile : data2) {
+ bigDecimal2 = bigDecimal2.add(tChargingPile.getRatedPower());
+ }
+ BigDecimal bigDecimal1 = new BigDecimal(data2.size()+"");
+ // 平均功率
+ BigDecimal divide = bigDecimal2.divide(bigDecimal1, 2, RoundingMode.HALF_DOWN);
+ // 充电量
+ BigDecimal chargingElectronic1 = tSettlementConfirm.getChargingElectronic();
+ // 桩数量
+ BigDecimal bigDecimal3 = new BigDecimal(data2.size());
+ BigDecimal multiply = chargingElectronic1.multiply(new BigDecimal("24"));
+ BigDecimal multiply1 = bigDecimal3.multiply(divide).multiply(new BigDecimal(temp));
+ tSettlementConfirm.setRate(chargingElectronic1.divide(multiply1,2,RoundingMode.HALF_DOWN)+"");
+ }else{
+ tSettlementConfirm.setRate("");
+ }
+
+
+ for (TSettlementConfirm settlementConfirm : list2) {
+ int value = parse.getMonth().getValue();
+ settlementConfirm.setMonth(value);
+ settlementConfirm.setIncome(settlementConfirm.getElectrovalence().add(settlementConfirm.getServiceCharge()));
+ tSettlementConfirm.setMetering(tSettlementConfirm.getSupplyElectronic());
+ if (tSettlementConfirm.getSiteId().equals(settlementConfirm.getSiteId())){
+ // 电站相同比较收入涨幅跌幅
+ if (tSettlementConfirm.getIncome().compareTo(BigDecimal.ZERO)>0){
+ BigDecimal subtract = tSettlementConfirm.getIncome().subtract(settlementConfirm.getIncome()).divide(tSettlementConfirm.getIncome(),2, RoundingMode.HALF_DOWN).multiply(new BigDecimal("100"));
+ tSettlementConfirm.setIncomePercentage(subtract+"%");
+ }else {
+ tSettlementConfirm.setIncomePercentage("100"+"%");
+
+ }
+
+ // 比较总利润 收入合计-成本合计
+ BigDecimal subtract1 = tSettlementConfirm.getIncome().subtract(tSettlementConfirm.getCost());
+ BigDecimal subtract2 = settlementConfirm.getIncome().subtract(settlementConfirm.getCost());
+ BigDecimal bigDecimal1 = subtract1.subtract(subtract2)
+ .divide(subtract2, 2, RoundingMode.HALF_DOWN)
+ .multiply(new BigDecimal("100"))
+ .setScale(2, RoundingMode.HALF_DOWN);
+ tSettlementConfirm.setTotalPercentage(bigDecimal1+"%"); }
+ beforeCost = beforeCost.add(settlementConfirm.getCost());
+ beforeIncome = beforeIncome.add(settlementConfirm.getIncome());
+ }
+ i++;
+ }
+ TSettlementConfirm tSettlementConfirm = new TSettlementConfirm();
+ tSettlementConfirm.setMonth(parse.getMonthValue());
+ 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,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,2, RoundingMode.HALF_DOWN).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 SettlementTotalVO settlementTotalR(String time,Long userId) {
+ //如果没传siteId,获取当前登陆人所有的siteIds
+ List<Integer> siteIds = new ArrayList<>();
+ if (userId != null){
+ List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
+ for (GetSiteListDTO datum : data) {
+ siteIds.add(datum.getId());
+ }
+ }
+ if (siteIds.isEmpty()){
+ siteIds.add(-1);
+ }
+ List<Site> siteList = siteClient.getSiteAll().getData();
+ List<TChargingGun> gunList = chargingGunClient.getAllGun().getData();
+ List<TChargingPile> pileList = chargingGunClient.getAllPile().getData();
+ List<TAppUser> userList = appUserClient.getAllUser().getData();
+ List<TAppUserCar> carList = appUserCarClient.getAllCar().getData();
+ List<TChargingOrder> totalOrder = chargingOrderService.list(new LambdaQueryWrapper<>(TChargingOrder.class)
+ .eq(TChargingOrder::getRechargePaymentStatus, 2));
+ SettlementTotalVO res = new SettlementTotalVO();
+ List<TSettlementConfirm> list1 = tSettlementConfirmMapper.settlementTotal(time,siteIds);
+ LocalDateTime parse = LocalDateTime.parse(time, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ List<TSettlementConfirm> list2 = tSettlementConfirmMapper.settlementTotal(time,siteIds);
// 合计
List<TSettlementConfirm> total = new ArrayList<>();
@@ -2747,7 +3520,7 @@
for (TSettlementConfirm tSettlementConfirm : list1) {
tSettlementConfirm.setXuhao(i);
tSettlementConfirm.setMetering(tSettlementConfirm.getSupplyElectronic());
- List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(tSettlementConfirm.getSiteId())).getData();
+ List<Site> data1 = siteList.stream().filter(e -> e.getId().equals(tSettlementConfirm.getSiteId())).collect(Collectors.toList());
if (!data1.isEmpty()){
tSettlementConfirm.setSiteName(data1.get(0).getName());
}
@@ -2794,26 +3567,18 @@
eq.between("end_time", tSettlementConfirm.getStartTime(), tSettlementConfirm.getEndTime());
break;
}
- List<TChargingOrder> tChargingOrders = this.baseMapper.selectList(eq);
- Map<String,TChargingOrder> map = new HashMap<>();
- StringBuilder stringBuilder = new StringBuilder();
- for (TChargingOrder tChargingOrder : tChargingOrders) {
- stringBuilder.append(tChargingOrder.getCode()).append(",");
- }
+ List<TChargingOrder> tChargingOrders = totalOrder.stream().filter(e-> e.getPayTime()
+ .isBefore(tSettlementConfirm.getEndTime())
+ && e.getPayTime().isAfter(tSettlementConfirm.getStartTime())&&e.getSiteId().equals(tSettlementConfirm.getSiteId())).collect(Collectors.toList());
// 充电总时长
-
- Long temp = 1L;
- if (StringUtils.hasLength(stringBuilder.toString())){
- String substring = stringBuilder.substring(0, stringBuilder.length() - 1);
- for (String s : substring.split(",")) {
- UploadRealTimeMonitoringData data6 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(s).getData();
- if (data6!=null){
- temp+=(data6.getCumulative_charging_time()*60);
-
- }
-
- }
+ Long temp = 0L;
+ for (TChargingOrder tChargingOrder : tChargingOrders) {
+ LocalDateTime startTime = tChargingOrder.getStartTime();
+ LocalDateTime endTime = tChargingOrder.getEndTime();
+ // 计算时间差 单位秒
+ long between = ChronoUnit.SECONDS.between(startTime, endTime);
+ temp+=between;
}
List<TChargingPile> data = siteClient.getPileListBySiteId(tSettlementConfirm.getSiteId()).getData();
// 计算充电桩的功率平均值
@@ -3008,6 +3773,10 @@
public EndOfChargePageInfo getEndOfChargePageInfo(String id) {
EndOfChargePageInfo info = new EndOfChargePageInfo();
TChargingOrder chargingOrder = this.getById(id);
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ if(!chargingOrder.getAppUserId().equals(userId)){
+ throw new RuntimeException("权限不足");
+ }
info.setId(id);
info.setCode(chargingOrder.getCode());
info.setPaymentAmount(chargingOrder.getPaymentAmount());
@@ -3063,4 +3832,301 @@
public Long countCar(List<String> brands) {
return this.baseMapper.countCar(brands);
}
+
+
+ /**
+ * 添加三方平台充电订单数据
+ * @param query
+ */
+ @Override
+ public R addTripartitePlatformOrder(AddTripartitePlatformOrder query) {
+ //检查当前枪是否是正在使用中
+ TChargingOrder one = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, query.getChargingGunId())
+ .in(TChargingOrder::getStatus, Arrays.asList(1, 2, 3)).eq(TChargingOrder::getDelFlag, 0));
+ if(null != one){
+ return R.fail("充电枪正在充电中，启动失败");
+ }
+
+ //构建订单数据
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ TChargingOrder chargingOrder = new TChargingOrder();
+ String code = "CD" + Double.valueOf(Math.random() * 1000).intValue() + sdf.format(new Date());
+ chargingOrder.setCode(code);
+ chargingOrder.setOrderType(1);
+ chargingOrder.setOrderClassification(1);
+ TChargingGun tChargingGun = chargingGunClient.getChargingGunById(query.getChargingGunId()).getData();
+ TChargingPile chargingPile = chargingPileClient.getChargingPileById(tChargingGun.getChargingPileId()).getData();
+ chargingOrder.setSiteId(tChargingGun.getSiteId());
+ chargingOrder.setChargingPileId(tChargingGun.getChargingPileId());
+ chargingOrder.setChargingGunId(query.getChargingGunId());
+ chargingOrder.setRechargePaymentType(query.getRechargePaymentType());
+ chargingOrder.setRechargePaymentStatus(2);
+ chargingOrder.setRechargeAmount(query.getPaymentAmount());
+ chargingOrder.setVipDiscountAmount(BigDecimal.ZERO);
+ chargingOrder.setOrderSource(2);
+ Operator operator = operatorClient.getOperator(query.getOperatorId()).getData();
+ chargingOrder.setOperatorId(operator.getId());
+ chargingOrder.setAppUserId(operator.getId().longValue());
+ chargingOrder.setTripartitePlatformName(operator.getName());
+ chargingOrder.setStartChargeSeq(query.getStartChargeSeq());
+ //车辆信息
+ if(StringUtils.hasLength(query.getPlateNum())){
+ TAppUserCar appUserCar = appUserCarClient.getAppUserCarByLicensePlate(query.getPlateNum()).getData();
+ if(null != appUserCar){
+ chargingOrder.setAppUserCarId(appUserCar.getId());
+ }
+ chargingOrder.setPlateNum(query.getPlateNum());
+ }
+
+
+ chargingOrder.setTitle("【充电桩充电】" + chargingPile.getNumber() + "号桩/" + tChargingGun.getCode() + "号枪");
+ chargingOrder.setStatus(2);
+ chargingOrder.setPayTime(LocalDateTime.now());
+ chargingOrder.setChargeAmount(chargingOrder.getRechargeAmount());
+ this.save(chargingOrder);
+
+ Integer accountingStrategyId = tChargingGun.getAccountingStrategyId();
+ if(null == accountingStrategyId){
+ Site site = siteClient.getSiteByIds(Arrays.asList(tChargingGun.getSiteId())).getData().get(0);
+ //查询站点上面的计费策略
+ accountingStrategyId = site.getAccountingStrategyId();
+ }
+ TAccountingStrategy accountingStrategy = accountingStrategyClient.getAccountingStrategyById(accountingStrategyId).getData();
+
+ //添加订单的计费策略
+ List<TAccountingStrategyDetail> strategyDetailList = accountingStrategyDetailClient.getListByAccountingStrategyId(accountingStrategyId).getData();
+ AccountingStrategyOrder accountingStrategyOrder = new AccountingStrategyOrder();
+ BeanUtils.copyProperties(accountingStrategy, accountingStrategyOrder);
+ accountingStrategyOrder.setChargingOrderId(chargingOrder.getId());
+ accountingStrategyOrderService.save(accountingStrategyOrder);
+ List<AccountingStrategyDetailOrder> list1 = new ArrayList<>();
+ for (TAccountingStrategyDetail tAccountingStrategyDetail : strategyDetailList) {
+ AccountingStrategyDetailOrder accountingStrategyDetailOrder = new AccountingStrategyDetailOrder();
+ BeanUtils.copyProperties(tAccountingStrategyDetail, accountingStrategyDetailOrder);
+ accountingStrategyDetailOrder.setChargingOrderId(chargingOrder.getId());
+ list1.add(accountingStrategyDetailOrder);
+ }
+ accountingStrategyDetailOrderService.saveBatch(list1);
+
+
+ //添加安全检测数据到缓存中，每步安全检测完成后需要更新缓存数据
+ PreChargeCheck preChargeCheck = new PreChargeCheck();
+ preChargeCheck.setElectronicLockLock(false);
+ preChargeCheck.setInsulationTesting(false);
+ preChargeCheck.setSecureConnectionDetection(false);
+ preChargeCheck.setStartupSuccess(1);
+ String key = "AQJC_" + chargingOrder.getChargingGunId();
+ redisService.setCacheObject(key, preChargeCheck, 24L, TimeUnit.HOURS);
+
+ BigDecimal rechargeAmount = chargingOrder.getRechargeAmount();
+ //调用远程启动充电消息
+ PlatformStartCharging platformStartCharging = new PlatformStartCharging();
+ platformStartCharging.setTransaction_serial_number(chargingOrder.getCode());
+ platformStartCharging.setCharging_pile_code(chargingPile.getCode());
+ platformStartCharging.setCharging_gun_code(tChargingGun.getCode());
+ //使用订单id作为逻辑卡号
+ platformStartCharging.setCard_number(chargingOrder.getId().toString());
+ platformStartCharging.setAccount_balance(rechargeAmount);
+ log.info(chargingOrder.getCode() + "：-------------------远程调起开始充电请求-------------------" + platformStartCharging.toString());
+ sendMessageClient.platformStartCharging(platformStartCharging);
+// //异步线程检测远程启动的应答结果。如果失败，则需要全额退款
+// Long id = chargingOrder.getId();
+// //执行5分钟的定时任务检测
+// ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+// scheduler.scheduleAtFixedRate(()->{
+// if(timingDetection(id)){
+// scheduler.shutdown();
+// }
+// }, 5, 1, TimeUnit.SECONDS);
+
+ //推送三方平台订单状态
+ tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
+ return R.ok();
+ }
+
+
+ /**
+ * 三方平台停止充电操作
+ * @param startChargeSeq
+ * @return
+ */
+ @Override
+ public R tripartitePlatformStopCharge(String startChargeSeq) {
+ TChargingOrder order = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getStartChargeSeq, startChargeSeq));
+ Integer status = order.getStatus();
+ if(status != 3){
+ return R.fail("还未开始充电");
+ }
+ if(status == 4 || status == 5){
+ return R.fail("不能重复操作");
+ }
+ TChargingOrder chargingOrder = new TChargingOrder();
+ chargingOrder.setId(order.getId());
+ chargingOrder.setAppUserId(order.getOperatorId().longValue());
+ chargingOrder.setEndTime(LocalDateTime.now());
+ chargingOrder.setStatus(4);
+ chargingOrder.setEndMode(1);
+ this.updateById(chargingOrder);
+
+ tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
+
+ String code1 = order.getCode();
+ TChargingGun chargingGun = chargingGunClient.getChargingGunById(order.getChargingGunId()).getData();
+ //异步线程处理停机
+ ExecutorService cachedThreadPool = Executors.newFixedThreadPool(1);
+ cachedThreadPool.execute(()->{
+ //调用硬件停止充电，停止成功后开始计算费用退款
+ TChargingPile chargingPile = chargingPileClient.getChargingPileById(order.getChargingPileId()).getData();
+ PlatformStopCharging platformStopCharging = new PlatformStopCharging();
+ platformStopCharging.setCharging_pile_code(chargingPile.getCode());
+ platformStopCharging.setCharging_gun_code(chargingGun.getCode());
+ sendMessageClient.platformStopCharging(platformStopCharging);
+ log.info(code1 + "：-------------------远程停止充电请求-------------------");
+ log.info(platformStopCharging.toString());
+ });
+ return R.ok();
+ }
+
+
+ /**
+ * 获取充电后没有扣除费用的数据
+ * @return
+ */
+ @Override
+ public R getNotPaymentChargingOrder() {
+ List<TChargingOrder> list = this.list(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getPaymentAmount, 0)
+ .ne(TChargingOrder::getElectricity, 0).in(TChargingOrder::getStatus, Arrays.asList(4, 5)));
+ List<Map<String, Object>> mapList = new ArrayList<>();
+ for (TChargingOrder order : list) {
+ TransactionRecord transactionRecord = transactionRecordClient.findTransactionRecord(order.getCode()).getData();
+ Map<String, Object> map = new HashMap<>();
+ map.put("order", order);
+ map.put("transactionRecord", transactionRecord);
+ mapList.add(map);
+ }
+ return R.ok(mapList);
+ }
+
+
+ /**
+ *
+ * 手动推送订单给第三方平台
+ * @param code
+ * @return
+ */
+ @Override
+ public R pushOrderInfo(String code) {
+ TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, code));
+ tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
+ tcecClient.notificationStopChargeResult(chargingOrder.getStartChargeSeq(), chargingOrder.getChargingGunId().toString(),
+ chargingOrder.getOperatorId());
+ tcecClient.notificationChargeOrderInfo(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
+ return R.ok();
+ }
+
+
+
+
+ public R addChargingOrderSummaryData(){
+ List<TChargingOrderAccountingStrategy> list3 = chargingOrderAccountingStrategyService.list();
+ List<TChargingOrder> list1 = this.list(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getDelFlag, 0));
+ for (TChargingOrder chargingOrderVO : list1) {
+ if(null == chargingOrderVO.getStatus() || 5 != chargingOrderVO.getStatus()){
+ continue;
+ }
+ List<TChargingOrderAccountingStrategy> list4 = list3.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderVO.getId())).collect(Collectors.toList());
+ BigDecimal electronic_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal service_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal chargingCapacity = list4.stream().map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal serviceMoney = new BigDecimal("0");
+ BigDecimal paymentMoney = new BigDecimal("0");
+ if (!chargingOrderVO.getOrderSource().equals(2)) {
+ serviceMoney = serviceMoney.add(service_reduce);
+ paymentMoney = paymentMoney.add(electronic_reduce).add(service_reduce);
+ }else{
+ serviceMoney = serviceMoney.add(service_reduce.multiply(new BigDecimal("0.8")));
+ paymentMoney = paymentMoney.add(electronic_reduce).add(service_reduce.multiply(new BigDecimal("0.8")));
+ }
+ Long time = 0L;
+ if (chargingOrderVO.getStartTime()!=null && chargingOrderVO.getEndTime()!=null){
+ LocalDateTime startTime = chargingOrderVO.getStartTime();
+ LocalDateTime endTime = chargingOrderVO.getEndTime();
+ // 计算时间差 单位秒
+ long between = ChronoUnit.SECONDS.between(startTime, endTime);
+ time+=between;
+ }
+
+ TChargingOrderSummaryData summaryData = new TChargingOrderSummaryData();
+ summaryData.setChargingOrderId(chargingOrderVO.getId());
+ summaryData.setChargingCapacity(chargingCapacity);
+ summaryData.setChargingDuration(time);
+ summaryData.setIncome(paymentMoney.setScale(2, BigDecimal.ROUND_HALF_EVEN));
+ summaryData.setElectricPrice(electronic_reduce.setScale(2, BigDecimal.ROUND_HALF_EVEN));
+ summaryData.setServicePrice(serviceMoney.setScale(2, BigDecimal.ROUND_HALF_EVEN));
+ chargingOrderSummaryDataService.save(summaryData);
+ }
+ return R.ok();
+ }
+
+ /**
+ * 大屏-新能源汽车电池安全检测次数统计
+ */
+ @Override
+ public R<StatisticsOfBatteryVO> getStatisticsOfBattery() {
+ StatisticsOfBatteryVO vo = new StatisticsOfBatteryVO();
+ //1.计算累计次数
+ //查询该俩站点的快充和超充的充电枪id集合 site_id 25 26 charge_model 1 2
+ R<List<Integer>> r = chargingGunClient.getGunIdsBySiteIdsAndChargeModels(Arrays.asList(25,26),Arrays.asList(1,2));
+ if (r.getCode()!=200){
+ return R.ok(vo);
+ }
+ List<Integer> gunIds=r.getData();
+ //统计
+ Long total= 0L;
+ if(gunIds!=null && !gunIds.isEmpty()) {
+ total = this.baseMapper.selectCount(new LambdaQueryWrapper<TChargingOrder>()
+ .eq(TChargingOrder::getDelFlag, 0)//未删除
+ .in(TChargingOrder::getStatus, Arrays.asList(3, 5))//充电中、已结束
+ .in(TChargingOrder::getChargingGunId, gunIds));//符合条件的充电枪
+ }
+ vo.setTotal(total.intValue());
+ //2.折线图
+ /* // 计算日期范围：前七天（不含今日）直接查找数据量太大,内存报错
+ LocalDate today = LocalDate.now();
+ LocalDateTime startDate = today.minusDays(7).atStartOfDay();
+ LocalDateTime endDate = today.minusDays(1).atTime(LocalTime.MAX);
+ // 查询数据库
+ List<OrderCountByDate> orderCounts = this.baseMapper.countOrdersByDate(startDate, endDate, gunIds);*/
+
+
+ List<LocalDate> dates = new ArrayList<>();
+ List<Integer> counts = new ArrayList<>();
+ LocalDate today = LocalDate.now();
+ // 直接查找数据量太大，内存报错，分每天查找
+ for (int i = 7; i >= 1; i--) {//升序
+ LocalDate day = today.minusDays(i);
+ LocalDateTime startOfDay = day.atStartOfDay();
+ LocalDateTime endOfDay = day.atTime(LocalTime.MAX);
+ //统计
+ Long count=0L;
+ if(gunIds!=null && !gunIds.isEmpty()){
+ count = this.baseMapper.selectCount(new LambdaQueryWrapper<TChargingOrder>()
+ .eq(TChargingOrder::getDelFlag,0)//未删除
+ .in(TChargingOrder::getStatus,Arrays.asList(3,5))//充电中、已结束
+ .in(TChargingOrder::getChargingGunId,gunIds)//符合条件的充电枪 站点 超充快充
+ .between(TChargingOrder::getCreateTime,startOfDay,endOfDay));//每天
+ }
+ dates.add(day);
+ counts.add(count.intValue());
+ }
+ vo.setDates(dates);
+ vo.setCounts(counts);
+ return R.ok(vo);
+ }
+ @Override
+ public BigDecimal getSumDegreeBySiteIds(List<Integer> siteIds) {
+
+ return this.baseMapper.getSumDegreeBySiteIds(siteIds);
+
+ }
}
--
Gitblit v1.7.1