From 26043931d294d84ff7ef0305bf7879f74d70afdd Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 五月 2026 17:32:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0.1
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 70 +++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index dbcac9e..3e32e86 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -3,13 +3,16 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.account.api.feignClient.AppUserCarClient;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.account.api.model.TAppUserCar;
+import com.ruoyi.chargingPile.api.feignClient.ChargingGunClient;
import com.ruoyi.chargingPile.api.feignClient.SiteClient;
import com.ruoyi.chargingPile.api.model.Partner;
import com.ruoyi.chargingPile.api.model.Site;
+import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.WebUtils;
@@ -47,6 +50,7 @@
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -75,7 +79,13 @@
@Resource
private AppUserClient appUserClient;
@Resource
+ private ChargingGunClient chargingGunClient;
+ @Resource
private AppUserCarClient appUserCarClient;
+ @Resource
+ private AccountingStrategyOrderService accountingStrategyOrderService;
+ @Resource
+ private TChargingOrderAccountingStrategyService tChargingOrderAccountingStrategyService;
@@ -102,24 +112,41 @@
public void export(@RequestBody ChargingListQuery dto) {
List<TChargingOrderExport> tChargingOrderExports = new ArrayList<>();
List<ChargingOrderListVO> exportList = chargingOrderService.export(dto);
+ int i = 1;
+ List<TChargingGun> data = chargingGunClient.getAllGun().getData();
List<Site> data9 = siteClient.getSiteAll().getData();
List<TAppUser> data6 = appUserClient.getAllUser().getData();
List<Partner> data7 = siteClient.getAllPartner().getData();
+// List<Long> collect = exportList.stream().map(ChargingOrderListVO::getId).collect(Collectors.toList());
+// List<TChargingOrderAccountingStrategy> stageCostAll = tChargingOrderAccountingStrategyService.list(new QueryWrapper<TChargingOrderAccountingStrategy>()
+// .in("charging_order_id", collect));
List<TVip> data5 = vipClient.getAllVip().getData();
List<TAppUserCar> data8 = appUserCarClient.getAllCar().getData();
for (ChargingOrderListVO chargingOrderListVO : exportList) {
TChargingOrderExport tChargingOrderExport = new TChargingOrderExport();
Site site = data9.stream().filter(e -> e.getId().equals(chargingOrderListVO.getSiteId())).findFirst().orElse(null);
TAppUser data3 = data6.stream().filter(e->e.getId().equals(chargingOrderListVO.getAppUserId())).findFirst().orElse(null);
+ TChargingGun data4 = data.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingGunId())).findFirst().orElse(null);
if (site!=null){
+ tChargingOrderExport.setSiteCode(site.getCode());
tChargingOrderExport.setSiteName(chargingOrderListVO.getSiteName());
+ tChargingOrderExport.setCity(site.getCity());
+ tChargingOrderExport.setCityName(site.getDistricts());
+ tChargingOrderExport.setSiteType(site.getSiteType());
+ tChargingOrderExport.setStatus(site.getStatus()+"");
Partner data2 = data7.stream().filter(e->e.getId().equals(site.getPartnerId())).findFirst().orElse(null);
if (data2!=null){
tChargingOrderExport.setPartner(data2.getName());
}
}
+ tChargingOrderExport.setSaleType("1");
+ tChargingOrderExport.setBusinessCategory("1");
+ tChargingOrderExport.setId(i);
tChargingOrderExport.setCode(chargingOrderListVO.getCode());
+ tChargingOrderExport.setTerminalName(chargingOrderListVO.getTerminalName());
tChargingOrderExport.setName(chargingOrderListVO.getAccountingStrategyName());
+ tChargingOrderExport.setOrderClassification("1");
+ tChargingOrderExport.setStartType("扫码");
tChargingOrderExport.setOne("小程序");
if (chargingOrderListVO.getRechargePaymentType()!=null){
if (chargingOrderListVO.getOrderSource()!=null&&chargingOrderListVO.getOrderSource().equals(2)){
@@ -160,15 +187,47 @@
String s3 = DateUtils.localDateTimeToString(chargingOrderListVO.getEndTime());
tChargingOrderExport.setEndTime(s3);
}
+ tChargingOrderExport.setRechargePaymentStatus(chargingOrderListVO.getRechargePaymentStatus()+"");
+ tChargingOrderExport.setType("充电订单");
+ tChargingOrderExport.setChargingType("单桩双充");
tChargingOrderExport.setEndmode(chargingOrderListVO.getEndMode()+"");
+ tChargingOrderExport.setChargingEndAccount("平台");
+ tChargingOrderExport.setIsFree("否");
tChargingOrderExport.setElectrovalence(chargingOrderListVO.getElectrovalence()+"");
tChargingOrderExport.setServiceCharge(chargingOrderListVO.getServiceCharge()+"");
tChargingOrderExport.setTotal(chargingOrderListVO.getPaymentAmount()+"");
tChargingOrderExport.setChargingCapacity(chargingOrderListVO.getElectricity()+"");
+// List<TChargingOrderAccountingStrategy> stageCost = stageCostAll.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderListVO.getId())).collect(Collectors.toList());
+// if (!stageCost.isEmpty()){
+// // 累加时段电费单价 取平均值
+// BigDecimal bigDecimal1 = new BigDecimal("0");
+// BigDecimal bigDecimal2 = new BigDecimal("0");
+// BigDecimal bigDecimal3 = new BigDecimal("0");
+// BigDecimal size = new BigDecimal(stageCost.size());
+//
+// for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : stageCost) {
+// bigDecimal1 = bigDecimal1.add(tChargingOrderAccountingStrategy.getPeriodElectricPrice());
+// bigDecimal2 = bigDecimal2.add(tChargingOrderAccountingStrategy.getPeriodServicePrice());
+// bigDecimal3 = bigDecimal3.add(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice());
+// }
+// BigDecimal divide1 = bigDecimal1.divide(size, 2, RoundingMode.HALF_DOWN);
+// BigDecimal divide2 = bigDecimal2.divide(size, 2, RoundingMode.HALF_DOWN);
+// BigDecimal divide3 = bigDecimal3.divide(size, 2, RoundingMode.HALF_DOWN);
+// tChargingOrderExport.setElectrovalencePrice(divide1+"");
+// tChargingOrderExport.setServiceChargePrice(divide2+"");
+// tChargingOrderExport.setServiceChargePriceLook(divide3+"");
+// }
+ tChargingOrderExport.setElectrovalencePrice("");
+ tChargingOrderExport.setServiceChargePrice("");
+ tChargingOrderExport.setServiceChargePriceLook("");
tChargingOrderExport.setCumulativeChargingTime(chargingOrderListVO.getChargingSecond() + "");
tChargingOrderExport.setRefundAmount(null != chargingOrderListVO.getRefundAmount() ? chargingOrderListVO.getRefundAmount().toString() : "");
tChargingOrderExport.setStartSoc(chargingOrderListVO.getStartSoc());
tChargingOrderExport.setEndtSoc(chargingOrderListVO.getEndSoc());
+ tChargingOrderExport.setIsSoc("否");
+ tChargingOrderExport.setIsSocType("");
+ tChargingOrderExport.setIsSocNum("0");
+ tChargingOrderExport.setUserType("普通个人用户");
if (data3!=null&&data3.getVipId()!=null){
TVip data1 = data5.stream().filter(e->e.getId().equals(data3.getVipId())).findFirst().orElse(null);
if (data1!=null){
@@ -177,12 +236,23 @@
}
tChargingOrderExport.setIsPlus(chargingOrderListVO.getVipDiscountAmount().compareTo(BigDecimal.ZERO)>0?"是":"否");
if (data3!=null){
+ tChargingOrderExport.setRealName(data3.getName());
tChargingOrderExport.setPhone(data3.getPhone());
+ tChargingOrderExport.setNickName(data3.getName());
}
+ if (data4!=null){
+ tChargingOrderExport.setDeviceCode(data4.getCode());
+ }
+ tChargingOrderExport.setAccountType("个人");
TAppUserCar tAppUserCar = data8.stream().filter(e -> e.getId().equals(chargingOrderListVO.getAppUserId())).findFirst().orElse(null);
if (tAppUserCar!=null){
tChargingOrderExport.setCarNumber(tAppUserCar.getLicensePlate());
}
+ tChargingOrderExport.setBalanceIncome(formatMoney(chargingOrderListVO.getBalanceIncome()));
+ tChargingOrderExport.setBalanceGiftIncome(formatMoney(chargingOrderListVO.getBalanceGiftIncome()));
+ tChargingOrderExport.setTripartiteCommission(formatMoney(chargingOrderListVO.getSharingAmount()));
+ tChargingOrderExport.setOrderCode(chargingOrderListVO.getStartChargeSeq());
+ tChargingOrderExport.setIsSingle("是");
tChargingOrderExport.setPayTime(chargingOrderListVO.getPayTime()+"");
tChargingOrderExport.setSharingAmount(formatMoney(chargingOrderListVO.getSharingAmount()));
tChargingOrderExport.setIsWhitelist(Integer.valueOf(1).equals(chargingOrderListVO.getIsWhitelist()) ? "是" : "否");
--
Gitblit v1.7.1