From 1d1e3c49ebd29144b2f6ce8710523bae763b855b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 20 三月 2025 14:38:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 38 ++++--
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 239 +++++++++++++++++++++++++----------------------
2 files changed, 150 insertions(+), 127 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
index 33ffeb3..cdc194f 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
@@ -20,18 +20,16 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
-import com.ruoyi.order.api.model.TChargingOrder;
-import com.ruoyi.order.api.model.TChargingOrderRefund;
+import com.ruoyi.order.api.model.*;
import com.ruoyi.order.api.vo.ChargingBillListVO;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.order.api.model.TChargingBill;
import com.ruoyi.order.api.vo.ChargingBillVO;
-import com.ruoyi.order.api.model.ChargingListQuery;
import com.ruoyi.order.mapper.TChargingBillMapper;
import com.ruoyi.order.mapper.TChargingOrderMapper;
import com.ruoyi.order.service.TChargingBillService;
+import com.ruoyi.order.service.TChargingOrderAccountingStrategyService;
import com.ruoyi.order.service.TChargingOrderRefundService;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
@@ -158,6 +156,7 @@
BigDecimal sharingAmountTotal = new BigDecimal("0");
BigDecimal chargingCapacityTotal = new BigDecimal("0");
BigDecimal discountTotal = new BigDecimal("0");
+ List<TChargingOrderAccountingStrategy> list3 = chargingOrderAccountingStrategyService.list();
for (ChargingBillListVO chargingBillListVO : list) {
@@ -229,6 +228,7 @@
chargingBillVO.setCategory("");
chargingBillVO.setExportList(tChargingOrders);
for (TChargingOrder tChargingOrder : tChargingOrders) {
+
Site site1 = siteList.stream().filter(site -> site.getId().equals(tChargingOrder.getSiteId())).findFirst().orElse(null);
if (site1!=null){
chargingBillVO.setSiteName(site1.getName());
@@ -252,26 +252,29 @@
tChargingOrder.setOrderClassification1("线上订单");
tChargingOrder.setRechargePaymentType1("预付");
tChargingOrder.setChargingType("充电桩接口充电服务");
- switch (tChargingOrder.getStatus()){
- case 1:
- tChargingOrder.setStatus1("等待中");
- break;
- case 2:
- tChargingOrder.setStatus1("启动中");
- break;
- case 3:
- tChargingOrder.setStatus1("充电中");
- break;
- case 4:
- tChargingOrder.setStatus1("停止中");
- break;
- case 5:
- tChargingOrder.setStatus1("已结束");
- break;
- case 0:
- tChargingOrder.setStatus1("未知");
- break;
+ if (tChargingOrder.getStatus()!=null){
+ switch (tChargingOrder.getStatus()){
+ case 1:
+ tChargingOrder.setStatus1("等待中");
+ break;
+ case 2:
+ tChargingOrder.setStatus1("启动中");
+ break;
+ case 3:
+ tChargingOrder.setStatus1("充电中");
+ break;
+ case 4:
+ tChargingOrder.setStatus1("停止中");
+ break;
+ case 5:
+ tChargingOrder.setStatus1("已结束");
+ break;
+ case 0:
+ tChargingOrder.setStatus1("未知");
+ break;
+ }
}
+
if (tChargingOrder.getEndMode()!=null){
switch (tChargingOrder.getEndMode()){
case 1:
@@ -288,8 +291,6 @@
break;
}
}
- BigDecimal add = tChargingOrder.getElectrovalence().add(tChargingOrder.getServiceCharge());
- tChargingOrder.setTotalAmount(add.toString());
tChargingOrder.setDiscount(tChargingOrder.getCouponDiscountAmount()!=null?tChargingOrder.getCouponDiscountAmount().toString():"0");
// UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(tChargingOrder.getCode()).getData();
// if (data5!=null){
@@ -332,18 +333,29 @@
}else{
tChargingOrder.setLicensePlate(tChargingOrder.getPlateNum());
}
+ 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 charging_capacity = list4.stream().map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ tChargingOrder.setTotalAmount(electronic_reduce.add(service_reduce)+"");
// 累加实收金额 支付结算金额
- if (tChargingOrder.getRechargeAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
- }
+ if (tChargingOrder.getOrderSource()!=2){
+ paymentAmount = paymentAmount.add(electronic_reduce.add(service_reduce));
+ // 累加累计服务费
+ serviceCharge = serviceCharge.add(service_reduce);
+ }else{
+ paymentAmount = paymentAmount.add(electronic_reduce.add(service_reduce.multiply(new BigDecimal("0.8"))));
+ // 累加累计服务费
+ serviceCharge = serviceCharge.add(service_reduce.multiply(new BigDecimal("0.8")));
+ }
+
// 总金额
if (tChargingOrder.getRechargeAmount()!=null){
orderAmount = orderAmount.add(tChargingOrder.getRechargeAmount());
}
// 累加累计电费
- if (tChargingOrder.getElectrovalence()!=null){
- electrovalence = electrovalence.add(tChargingOrder.getElectrovalence());
- }
+ electrovalence = electrovalence.add(electronic_reduce);
+
if (tChargingOrder.getRechargeAmount()!=null){
rechargeAmount = rechargeAmount.add(tChargingOrder.getRechargeAmount());
}
@@ -351,24 +363,17 @@
for (TChargingOrderRefund tChargingOrderRefund : list2) {
refundAmount = refundAmount.add(tChargingOrderRefund.getRefundTotalAmount());
}
- // 累加累计服务费
- if (tChargingOrder.getServiceCharge()!=null){
- serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
- }
// 累加平台手续费
if (tChargingOrder.getOrderAmount()!=null){
commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(BigDecimal.valueOf(0.006))
.setScale(2,BigDecimal.ROUND_DOWN));
}
// 累加平台分佣
- if (tChargingOrder.getOrderSource()==2 && tChargingOrder.getServiceCharge()!=null){
- sharingAmount = sharingAmount.add(tChargingOrder.getServiceCharge().multiply(BigDecimal.valueOf(0.2)).setScale(2,BigDecimal.ROUND_DOWN));
+ if (tChargingOrder.getOrderSource()==2){
+ sharingAmount = sharingAmount.add(service_reduce.multiply(BigDecimal.valueOf(0.2)).setScale(2,BigDecimal.ROUND_DOWN));
}
// 累加充电度数
- if (tChargingOrder.getChargingCapacity()!=null){
- chargingCapacity = chargingCapacity.add(tChargingOrder.getChargingCapacity());
- }
-
+ chargingCapacity = chargingCapacity.add(charging_capacity);
}
// 将chargingSecond 这是以秒为单位存放的总秒数 将其转化为xx小时xx分钟xx秒
int hours = chargingSecond / 3600;
@@ -446,17 +451,26 @@
&& e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
}
for (TChargingOrder tChargingOrder : tChargingOrders) {
- if (tChargingOrder.getOrderAmount()!=null){
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
+ 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 charging_capacity = list4.stream().map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ tChargingOrder.setTotalAmount(electronic_reduce.add(service_reduce)+"");
+ if (tChargingOrder.getOrderSource()!=2){
+ paymentAmountTotal = paymentAmountTotal.add(electronic_reduce.add(service_reduce));
+ // 累加累计服务费
+ serviceChargeTotal = serviceChargeTotal.add(service_reduce);
+ }else{
+ paymentAmountTotal = paymentAmountTotal.add(electronic_reduce.add(service_reduce.multiply(new BigDecimal("0.8"))));
+ // 累加累计服务费
+ serviceChargeTotal = serviceChargeTotal.add(service_reduce.multiply(new BigDecimal("0.8")));
}
// 累加订单金额
if (tChargingOrder.getRechargeAmount()!=null){
orderAmountTotal = orderAmountTotal.add(tChargingOrder.getRechargeAmount());
}
// 累加累计电费
- if (tChargingOrder.getElectrovalence()!=null){
- electrovalenceTotal = electrovalenceTotal.add(tChargingOrder.getElectrovalence());
- }
+ electrovalenceTotal = electrovalenceTotal.add(electronic_reduce);
List<TChargingOrderRefund> list2 = totalRefund.stream().filter(e -> e.getChargingOrderId().equals(tChargingOrder.getId())).collect(Collectors.toList());
for (TChargingOrderRefund tChargingOrderRefund : list2) {
refundAmountTotal =refundAmountTotal.add(tChargingOrderRefund.getRefundAmount());
@@ -466,24 +480,19 @@
tChargingOrder.setRefundTime1(DateUtils.localDateTimeToString(tChargingOrderRefund.getRefundTime()));
bigDecimal = bigDecimal.add(tChargingOrderRefund.getRefundAmount());
}
- // 累加累计服务费
- if (tChargingOrder.getServiceCharge()!=null){
- serviceChargeTotal = serviceChargeTotal.add(tChargingOrder.getServiceCharge());
- }
+
// 累加平台手续费
if (tChargingOrder.getOrderAmount()!=null){
commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006"))
.setScale(2,BigDecimal.ROUND_DOWN));
}
// 累加平台分佣
- if (tChargingOrder.getOrderSource()==2 && tChargingOrder.getServiceCharge()!=null){
- sharingAmountTotal = sharingAmountTotal.add(tChargingOrder.getServiceCharge().multiply(BigDecimal.valueOf(0.2)).setScale(2,BigDecimal.ROUND_DOWN));
+ if (tChargingOrder.getOrderSource()==2 ){
+ sharingAmountTotal = sharingAmountTotal.add(service_reduce.multiply(BigDecimal.valueOf(0.2)).setScale(2,BigDecimal.ROUND_DOWN));
}
// 累加充电度数
- if (tChargingOrder.getElectricity()!=null){
+ chargingCapacityTotal = chargingCapacityTotal.add(charging_capacity);
- chargingCapacityTotal = chargingCapacityTotal.add(tChargingOrder.getElectricity());
- }
// 累加优惠金额
if (tChargingOrder.getCouponDiscountAmount()!=null){
discountTotal = discountTotal.add(tChargingOrder.getCouponDiscountAmount());
@@ -514,7 +523,8 @@
chargingBillVO.setList(pageInfo);
return chargingBillVO;
}
-
+ @Resource
+ private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;
@Override
public ChargingBillVO chargingBillList(ChargingListQuery dto) {
@@ -540,6 +550,8 @@
List<TChargingPile> pileList = chargingGunClient.getAllPile().getData();
List<TAppUser> userList = appUserClient.getAllUser().getData();
List<TAppUserCar> carList = appUserCarClient.getAllCar().getData();
+ List<TChargingOrderAccountingStrategy> list3 = chargingOrderAccountingStrategyService.list();
+
Long userId = tokenService.getLoginUser().getUserid();
// 查询当前登陆人按钮权限
SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
@@ -695,26 +707,29 @@
tChargingOrder.setOrderClassification1("线上订单");
tChargingOrder.setRechargePaymentType1("预付");
tChargingOrder.setChargingType("充电桩接口充电服务");
- switch (tChargingOrder.getStatus()){
- case 1:
- tChargingOrder.setStatus1("等待中");
- break;
- case 2:
- tChargingOrder.setStatus1("启动中");
- break;
- case 3:
- tChargingOrder.setStatus1("充电中");
- break;
- case 4:
- tChargingOrder.setStatus1("停止中");
- break;
- case 5:
- tChargingOrder.setStatus1("已结束");
- break;
- case 0:
- tChargingOrder.setStatus1("未知");
- break;
+ if (tChargingOrder.getStatus()!=null){
+ switch (tChargingOrder.getStatus()){
+ case 1:
+ tChargingOrder.setStatus1("等待中");
+ break;
+ case 2:
+ tChargingOrder.setStatus1("启动中");
+ break;
+ case 3:
+ tChargingOrder.setStatus1("充电中");
+ break;
+ case 4:
+ tChargingOrder.setStatus1("停止中");
+ break;
+ case 5:
+ tChargingOrder.setStatus1("已结束");
+ break;
+ case 0:
+ tChargingOrder.setStatus1("未知");
+ break;
+ }
}
+
if (tChargingOrder.getEndMode()!=null){
switch (tChargingOrder.getEndMode()){
case 1:
@@ -774,43 +789,44 @@
tChargingOrder.setUserName(data3.getName());
tChargingOrder.setPhone(data3.getPhone());
}
- if ( tChargingOrder.getPaymentAmount()!=null&&(!tChargingOrder.getOrderSource().equals(2))){
+ 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 charging_capacity = list4.stream().map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ if ( !tChargingOrder.getOrderSource().equals(2)){
// 实收
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
+ paymentAmount = paymentAmount.add(electronic_reduce).add(service_reduce);
}
// 总金额
if (tChargingOrder.getRechargeAmount()!=null){
orderAmount = orderAmount.add(tChargingOrder.getRechargeAmount());
}
// 累加累计电费
- if (tChargingOrder.getElectrovalence()!=null){
- electrovalence = electrovalence.add(tChargingOrder.getElectrovalence());
- }
+ electrovalence = electrovalence.add(electronic_reduce);
if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus() !=null && tChargingOrder.getRefundStatus() == 2){
refundAmount = refundAmount.add(tChargingOrder.getRefundAmount());
}
// 累加累计服务费
- if (tChargingOrder.getServiceCharge()!=null){
+
if (tChargingOrder.getOrderSource().equals(2)) {
- serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN));
+ serviceCharge = serviceCharge.add(service_reduce.multiply(new BigDecimal("0.8")).setScale(2, BigDecimal.ROUND_DOWN));
// 累加平台分佣
- sharingAmount = sharingAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
+ sharingAmount = sharingAmount.add(service_reduce.multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
// 累加实收
- paymentAmount = paymentAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
+ paymentAmount = paymentAmount.add(electronic_reduce).add(service_reduce.multiply(new BigDecimal("0.8")).setScale(2,BigDecimal.ROUND_DOWN));
}else {
- serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
+ serviceCharge = serviceCharge.add(service_reduce);
}
- }
+
// 累加平台手续费
- if (tChargingOrder.getOrderAmount()!=null){
+ if (tChargingOrder.getRechargeAmount()!=null){
commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(BigDecimal.valueOf(0.006))
.setScale(2,BigDecimal.ROUND_DOWN));
}
// 累加充电度数
- if (tChargingOrder.getChargingCapacity()!=null){
- chargingCapacity = chargingCapacity.add(tChargingOrder.getChargingCapacity());
- }
+ chargingCapacity = chargingCapacity.add(charging_capacity);
+
}
// 将chargingSecond 这是以秒为单位存放的总秒数 将其转化为xx小时xx分钟xx秒
int hours = chargingSecond / 3600;
@@ -895,12 +911,15 @@
BigDecimal chargingCapacity = new BigDecimal("0");
chargingBillListVO.setOrderCount(tChargingOrders.size());
for (TChargingOrder tChargingOrder : tChargingOrders) {
+ 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 charging_capacity = list4.stream().map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
// 累加实收金额
- if ( tChargingOrder.getPaymentAmount()!=null&&(!tChargingOrder.getOrderSource().equals(2))){
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
+ if (!tChargingOrder.getOrderSource().equals(2)){
+ paymentAmount = paymentAmount.add(electronic_reduce.add(service_reduce));
+ paymentAmountTotal = paymentAmountTotal.add(electronic_reduce.add(service_reduce));
}
-
// 累加订单金额
if (tChargingOrder.getRechargeAmount()!=null){
orderAmount = orderAmount.add(tChargingOrder.getRechargeAmount());
@@ -908,31 +927,27 @@
}
// 累加累计电费
if (tChargingOrder.getElectrovalence()!=null){
- electrovalence = electrovalence.add(tChargingOrder.getElectrovalence());
- electrovalenceTotal = electrovalenceTotal.add(tChargingOrder.getElectrovalence());
+ electrovalence = electrovalence.add(electronic_reduce);
+ electrovalenceTotal = electrovalenceTotal.add(electronic_reduce);
}
if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus() !=null && tChargingOrder.getRefundStatus() == 2){
refundAmountTotal = refundAmountTotal.add(tChargingOrder.getRefundAmount());
}
// 累加累计服务费
- if (tChargingOrder.getServiceCharge()!=null){
if (tChargingOrder.getOrderSource().equals(2)) {
- serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN));
- serviceChargeTotal = serviceChargeTotal.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN));
+ serviceCharge = serviceCharge.add(service_reduce.multiply(new BigDecimal("0.8")).setScale(2, BigDecimal.ROUND_DOWN));
+ serviceChargeTotal = serviceChargeTotal.add(service_reduce.multiply(new BigDecimal("0.8")).setScale(2, BigDecimal.ROUND_DOWN));
// 累加平台分佣
- sharingAmount = sharingAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN));
- sharingAmountTotal = sharingAmountTotal.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN));
+ sharingAmount = sharingAmount.add(service_reduce.multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN));
+ sharingAmountTotal = sharingAmountTotal.add(service_reduce.multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN));
// 累加实收
- paymentAmount = paymentAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
+ paymentAmount = paymentAmount.add(electronic_reduce.add(service_reduce.multiply(new BigDecimal("0.8")).setScale(2,BigDecimal.ROUND_DOWN)));
+ paymentAmountTotal = paymentAmountTotal.add(electronic_reduce.add(service_reduce.multiply(new BigDecimal("0.8")).setScale(2,BigDecimal.ROUND_DOWN)));
}else{
- serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
- serviceChargeTotal = serviceChargeTotal.add(tChargingOrder.getServiceCharge());
+ serviceCharge = serviceCharge.add(service_reduce);
+ serviceChargeTotal = serviceChargeTotal.add(service_reduce);
}
-
- }
-
- // 累加平台手续费
+ // 累加平台手续费
if (tChargingOrder.getOrderAmount()!=null){
commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN));
commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006"))
@@ -940,10 +955,8 @@
}
// 累加充电度数
- if (tChargingOrder.getElectricity()!=null){
- chargingCapacity = chargingCapacity.add(tChargingOrder.getElectricity());
- chargingCapacityTotal = chargingCapacityTotal.add(tChargingOrder.getElectricity());
- }
+ chargingCapacity = chargingCapacity.add(charging_capacity);
+ chargingCapacityTotal = chargingCapacityTotal.add(charging_capacity);
// 累加优惠金额
if (tChargingOrder.getCouponDiscountAmount()!=null){
discountTotal = discountTotal.add(tChargingOrder.getCouponDiscountAmount());
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 82c3b90..282599d 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
@@ -2867,6 +2867,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());
@@ -2922,25 +2924,37 @@
// 支付订单金额 需要减去退款金额
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.getOrderSource()==2) {
- sharingAmount = sharingAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
+ 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){
if (tChargingOrder.getOrderSource()==2) {
- serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
+ 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(tChargingOrder.getServiceCharge());
+ serviceCharge = serviceCharge.add(service_reduce);
}
}
// 累加会员折扣
@@ -2951,11 +2965,7 @@
if (tChargingOrder.getCouponDiscountAmount()!=null){
couponDiscount = couponDiscount.add(tChargingOrder.getCouponDiscountAmount());
}
- if (tChargingOrder.getPaymentAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
- orderCommission = orderCommission.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006"))
- .setScale(2,BigDecimal.ROUND_DOWN));
- }
+
}
--
Gitblit v1.7.1