From ae76f22f897cfd438b30829326b6ad36a80eaac0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 21 二月 2025 18:23:13 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 93 +++++++++++++++++++++-------------------------
1 files changed, 43 insertions(+), 50 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 3d81a92..76f11e3 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
@@ -88,13 +88,7 @@
@Override
public ChargingBillVO chargingBillList1(ChargingListQuery dto) {
- if (dto.getState()!=null){
- if (dto.getState()==1){
- dto.setState(2);
- }else {
- dto.setState(1);
- }
- }
+
ChargingBillVO chargingBillVO = new ChargingBillVO();
List<TChargingOrder> tChargingOrders1 = new ArrayList<>();
String startTime1 = null;
@@ -117,36 +111,35 @@
List<TChargingOrderRefund> totalRefund = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getRefundStatus, 2).list();
Integer roleType = sysUser.getRoleType();
List<Integer> siteIds = new ArrayList<>();
- //如果没传siteId,获取当前登陆人所有的siteIds
- if (dto.getSiteId()==null){
- if (userId != null){
- List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
- for (GetSiteListDTO datum : data) {
- siteIds.add(datum.getId());
- }
+ //如果没传siteId,获取当前登陆人所有的siteIds
+ 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.getAccountMenu(sysUser.getObjectId(),siteId).getData();
+ }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);
- }
+ Boolean b = t1.get(1);
+ if (b){
+ integers.add(siteId);
}
- siteIds = integers;
}
+ siteIds = integers;
}
- if (siteIds.isEmpty())siteIds.add(-1);
- dto.setSiteIds(siteIds);
+ }
+ dto.setSiteIds(siteIds);
PageInfo<ChargingBillListVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
@@ -162,7 +155,6 @@
BigDecimal sharingAmountTotal = new BigDecimal("0");
BigDecimal chargingCapacityTotal = new BigDecimal("0");
BigDecimal discountTotal = new BigDecimal("0");
- int orderCount = 0;
for (ChargingBillListVO chargingBillListVO : list) {
@@ -223,7 +215,6 @@
BigDecimal sharingAmount = new BigDecimal("0");
BigDecimal chargingCapacity = new BigDecimal("0");
BigDecimal refundAmount = new BigDecimal("0");
- orderCount+=tChargingOrders.size();
chargingBillVO.setCategory("");
chargingBillVO.setExportList(tChargingOrders);
for (TChargingOrder tChargingOrder : tChargingOrders) {
@@ -325,15 +316,17 @@
tChargingOrder.setLicensePlate(data4.getLicensePlate());
tChargingOrder.setVehicleModel(data4.getVehicleModel());
}
+ }else{
+ tChargingOrder.setLicensePlate(tChargingOrder.getPlateNum());
}
if (data3!=null)tChargingOrder.setUserName(data3.getName());
// 累加实收金额 支付结算金额
- if (tChargingOrder.getChargeAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getRechargeAmount());
+ if (tChargingOrder.getRechargeAmount()!=null){
+ paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
}
// 总金额
if (tChargingOrder.getOrderAmount()!=null){
- orderAmount = orderAmount.add(tChargingOrder.getOrderAmount());
+ orderAmount = orderAmount.add(tChargingOrder.getRechargeAmount());
}
// 累加累计电费
if (tChargingOrder.getElectrovalence()!=null){
@@ -352,7 +345,7 @@
}
// 累加平台手续费
if (tChargingOrder.getOrderAmount()!=null){
- commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(BigDecimal.valueOf(0.006))
+ commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(BigDecimal.valueOf(0.006))
.setScale(2,BigDecimal.ROUND_DOWN));
}
// 累加平台分佣
@@ -376,8 +369,8 @@
chargingBillVO.setPaymentAmount(BigDecimal.ZERO);
}
- chargingBillListVO.setPaymentAmount(rechargeAmount);
- chargingBillListVO.setOrderAmount(paymentAmount == null?BigDecimal.ZERO:orderAmount.subtract(sharingAmount).subtract(commissionAmount));
+ chargingBillListVO.setPaymentAmount(paymentAmount.subtract(sharingAmount));
+ chargingBillListVO.setOrderAmount(paymentAmount);
chargingBillListVO.setRefundAmount(refundAmount == null?BigDecimal.ZERO:refundAmount);
chargingBillListVO.setElectrovalence(electrovalence == null?BigDecimal.ZERO:electrovalence);
chargingBillListVO.setServiceCharge(serviceCharge == null?BigDecimal.ZERO:serviceCharge);
@@ -433,17 +426,16 @@
e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
&& e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
tChargingOrders1.addAll(tChargingOrders);
- orderCount+=tChargingOrders.size();
chargingBillVO.setCategory("");
chargingBillVO.setExportList(tChargingOrders);
for (TChargingOrder tChargingOrder : tChargingOrders) {
if (tChargingOrder.getOrderAmount()!=null){
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getRechargeAmount());
+ paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
}
// 累加订单金额
if (tChargingOrder.getOrderAmount()!=null){
- orderAmountTotal = orderAmountTotal.add(tChargingOrder.getOrderAmount());
+ orderAmountTotal = orderAmountTotal.add(tChargingOrder.getPaymentAmount());
}
// 累加累计电费
if (tChargingOrder.getElectrovalence()!=null){
@@ -464,7 +456,7 @@
}
// 累加平台手续费
if (tChargingOrder.getOrderAmount()!=null){
- commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006"))
+ commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006"))
.setScale(2,BigDecimal.ROUND_DOWN));
}
// 累加平台分佣
@@ -487,11 +479,10 @@
}
chargingBillVO.setOrderCount(i);
chargingBillVO.setChargingCapacity(chargingCapacityTotal);
- chargingBillVO.setPaymentAmount(paymentAmountTotal);
- chargingBillVO.setOrderAmount(orderAmountTotal.subtract(commissionAmountTotal).subtract(sharingAmountTotal));
+ chargingBillVO.setPaymentAmount(paymentAmountTotal.subtract(sharingAmountTotal));
+ chargingBillVO.setOrderAmount(orderAmountTotal);
chargingBillVO.setElectrovalence(electrovalenceTotal);
chargingBillVO.setServiceCharge(serviceChargeTotal);
- chargingBillVO.setOrderCount(orderCount);
chargingBillVO.setCommissionAmount(commissionAmountTotal);
chargingBillVO.setSharingAmount(sharingAmountTotal);
chargingBillVO.setDiscount(discountTotal);
@@ -754,6 +745,8 @@
tChargingOrder.setLicensePlate(tAppUserCar.getLicensePlate());
tChargingOrder.setVehicleModel(tAppUserCar.getVehicleModel());
}
+ }else{
+ tChargingOrder.setLicensePlate(tChargingOrder.getPlateNum());
}
if (data3!=null)tChargingOrder.setUserName(data3.getName());
if ( tChargingOrder.getPaymentAmount()!=null){
@@ -776,7 +769,7 @@
}
// 累加平台手续费
if (tChargingOrder.getOrderAmount()!=null){
- commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(BigDecimal.valueOf(0.006))
+ commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(BigDecimal.valueOf(0.006))
.setScale(2,BigDecimal.ROUND_DOWN));
}
// 累加平台分佣
@@ -797,7 +790,7 @@
chargingBillVO.setChargingTime(timeString);
chargingBillListVO.setOrderAmount(paymentAmount);
- chargingBillListVO.setPaymentAmount(paymentAmount.subtract(commissionAmount).subtract(sharingAmount).setScale(2,BigDecimal.ROUND_DOWN));
+ chargingBillListVO.setPaymentAmount(paymentAmount.subtract(sharingAmount).setScale(2,BigDecimal.ROUND_DOWN));
chargingBillListVO.setElectrovalence(electrovalence);
chargingBillListVO.setServiceCharge(serviceCharge.setScale(2,BigDecimal.ROUND_DOWN));
chargingBillListVO.setCommissionAmount(commissionAmount.setScale(2,BigDecimal.ROUND_DOWN));
@@ -884,8 +877,8 @@
}
// 累加平台手续费
if (tChargingOrder.getOrderAmount()!=null){
- commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN));
- commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006"))
+ 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"))
.setScale(2,BigDecimal.ROUND_DOWN));
}
// 累加平台分佣
--
Gitblit v1.7.1