From cbad982befcf58521b224da1e8898c23c5e0d2c6 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 29 五月 2025 16:49:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 146 +++++++++++++++++++++++++-----------------------
1 files changed, 75 insertions(+), 71 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 574c936..d6caee3 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,14 +3,11 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.ChargingPileClient;
-import com.ruoyi.chargingPile.api.feignClient.ParkingLotClient;
import com.ruoyi.chargingPile.api.feignClient.SiteClient;
import com.ruoyi.chargingPile.api.model.Partner;
import com.ruoyi.chargingPile.api.model.Site;
@@ -20,37 +17,27 @@
import com.ruoyi.common.core.utils.WebUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
-import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.order.api.dto.SettlementConfirmAdd;
import com.ruoyi.order.api.model.*;
import com.ruoyi.order.api.query.SettlementListQuery;
-import com.ruoyi.order.api.query.TOrderInvoiceQuery;
import com.ruoyi.order.api.vo.ChargingOrderListVO;
-import com.ruoyi.order.api.vo.SettlementTotalVO;
-import com.ruoyi.order.api.vo.TOrderInvoiceVO;
-import com.ruoyi.order.export.OrderInvoiceExport;
-import com.ruoyi.order.export.TChargingOrderExport;
-import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import com.ruoyi.order.api.vo.ChargingOrderTimeVO;
-import com.ruoyi.order.service.*;
+import com.ruoyi.order.api.vo.SettlementTotalVO;
+import com.ruoyi.order.export.TChargingOrderExport;
+import com.ruoyi.order.service.AccountingStrategyOrderService;
+import com.ruoyi.order.service.TChargingOrderAccountingStrategyService;
+import com.ruoyi.order.service.TChargingOrderService;
+import com.ruoyi.order.service.TSettlementConfirmService;
+import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.api.feignClient.VipClient;
-import com.ruoyi.payment.api.feignClient.AliPaymentClient;
-import com.ruoyi.payment.api.feignClient.WxPaymentClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.poi.ss.usermodel.Workbook;
-import org.omg.CORBA.PRIVATE_MEMBER;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -60,11 +47,12 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -85,13 +73,13 @@
private TSettlementConfirmService tSettlementConfirmService;
@Resource
private VipClient vipClient;
- @Autowired
+ @Resource
private SiteClient siteClient;
- @Autowired
+ @Resource
private AppUserClient appUserClient;
- @Autowired
+ @Resource
private ChargingGunClient chargingGunClient;
- @Autowired
+ @Resource
private AppUserCarClient appUserCarClient;
@Resource
private AccountingStrategyOrderService accountingStrategyOrderService;
@@ -123,26 +111,33 @@
@ApiOperation(value = "充电时段统计-导出", tags = {"管理后台-财务结算"})
@PutMapping("/export")
public void export(@RequestBody ChargingListQuery dto) {
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
ChargingOrderTimeVO res = chargingOrderService.chargingList(dto);
List<TChargingOrderExport> tChargingOrderExports = new ArrayList<>();
- List<ChargingOrderListVO> exportList = res.getList().getRecords();
- int i = 0;
+ List<ChargingOrderListVO> exportList = res.getExportList();
+ 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<AccountingStrategyOrder> listAll = accountingStrategyOrderService.lambdaQuery()
+ .list();
+ List<TChargingOrderAccountingStrategy> stageCostAll = tChargingOrderAccountingStrategyService.list(
+ );
+ List<TVip> data5 = vipClient.getAllVip().getData();
+ List<TAppUserCar> data8 = appUserCarClient.getAllCar().getData();
for (ChargingOrderListVO chargingOrderListVO : exportList) {
TChargingOrderExport tChargingOrderExport = new TChargingOrderExport();
-
- List<Site> data = siteClient.getSiteByIds(Arrays.asList(chargingOrderListVO.getSiteId())).getData();
- TAppUser data3 = appUserClient.getUserById(chargingOrderListVO.getAppUserId()).getData();
- TChargingGun data4 = chargingGunClient.getChargingGunById(chargingOrderListVO.getChargingGunId()).getData();
- if (data!=null&&(!data.isEmpty())){
- tChargingOrderExport.setSiteCode(data.get(0).getCode());
+ 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(data.get(0).getCity());
- tChargingOrderExport.setCityName(data.get(0).getDistricts());
- tChargingOrderExport.setSiteType(data.get(0).getSiteType());
- tChargingOrderExport.setStatus(data.get(0).getStatus()+"");
- Partner data2 = siteClient.getPartnerR(data.get(0).getPartnerId()).getData();
+ 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());
}
@@ -153,9 +148,9 @@
tChargingOrderExport.setCode(chargingOrderListVO.getCode());
tChargingOrderExport.setTerminalName(chargingOrderListVO.getTerminalName());
// 查询这笔订单的计费策略名称
- List<AccountingStrategyOrder> list = accountingStrategyOrderService.lambdaQuery()
- .eq(AccountingStrategyOrder::getChargingOrderId, chargingOrderListVO.getId())
- .list();
+ List<AccountingStrategyOrder> list = listAll.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderListVO.getId())).collect(Collectors.toList());
+
+
if (!list.isEmpty()){
tChargingOrderExport.setName(list.get(0).getName());
}
@@ -163,14 +158,28 @@
tChargingOrderExport.setStartType("扫码");
tChargingOrderExport.setOne("小程序");
if (chargingOrderListVO.getRechargePaymentType()!=null){
- switch (chargingOrderListVO.getRechargePaymentType()){
- case 1:
- tChargingOrderExport.setTwo("微信小程序");
- break;
- case 2:
- tChargingOrderExport.setTwo("支付宝小程序");
- break;
+ if (chargingOrderListVO.getOrderSource()!=null&&chargingOrderListVO.getOrderSource().equals(2)){
+ if (chargingOrderListVO.getTripartitePlatformName().equals("XinDianTu")){
+ tChargingOrderExport.setTwo("新电途");
+ tChargingOrderExport.setOne("互联互通");
+
+ }
+ if (chargingOrderListVO.getTripartitePlatformName().equals("KuaiDian")){
+ tChargingOrderExport.setTwo("快电");
+ tChargingOrderExport.setOne("互联互通");
+
+ }
+ }else{
+ switch (chargingOrderListVO.getRechargePaymentType()){
+ case 1:
+ tChargingOrderExport.setTwo("微信小程序");
+ break;
+ case 2:
+ tChargingOrderExport.setTwo("支付宝小程序");
+ break;
+ }
}
+
}
if (chargingOrderListVO.getCreateTime()!=null){
String s1 = DateUtils.localDateTimeToString(chargingOrderListVO.getCreateTime());
@@ -194,9 +203,7 @@
tChargingOrderExport.setServiceCharge(chargingOrderListVO.getServiceCharge()+"");
tChargingOrderExport.setTotal(chargingOrderListVO.getPaymentAmount()+"");
tChargingOrderExport.setChargingCapacity(chargingOrderListVO.getElectricity()+"");
- List<TChargingOrderAccountingStrategy> stageCost = tChargingOrderAccountingStrategyService.list(
- new LambdaQueryWrapper<TChargingOrderAccountingStrategy>()
- .eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrderListVO.getId()));
+ List<TChargingOrderAccountingStrategy> stageCost = stageCostAll.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderListVO.getId())).collect(Collectors.toList());
if (!stageCost.isEmpty()){
// 累加时段电费单价 取平均值
BigDecimal bigDecimal1 = new BigDecimal("0");
@@ -216,12 +223,12 @@
tChargingOrderExport.setServiceChargePrice(divide2+"");
tChargingOrderExport.setServiceChargePriceLook(divide3+"");
}
- // 获取充电时间
- UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrderListVO.getCode()).getData();
- if (data5!=null){
- if (data5.getTime_remaining()!=null){
- tChargingOrderExport.setCumulativeChargingTime(data5.getCumulative_charging_time()+"");
- }
+ if (chargingOrderListVO.getStartTime()!=null && chargingOrderListVO.getEndTime()!=null){
+ LocalDateTime startTime = chargingOrderListVO.getStartTime();
+ LocalDateTime endTime = chargingOrderListVO.getEndTime();
+ // 计算时间差 单位秒
+ long between = ChronoUnit.SECONDS.between(startTime, endTime);
+ tChargingOrderExport.setCumulativeChargingTime((between*60)+"");
}
tChargingOrderExport.setStartSoc(chargingOrderListVO.getStartSoc());
tChargingOrderExport.setEndtSoc(chargingOrderListVO.getEndSoc());
@@ -229,9 +236,8 @@
tChargingOrderExport.setIsSocType("");
tChargingOrderExport.setIsSocNum("0");
tChargingOrderExport.setUserType("普通个人用户");
- TAppUser data2 = appUserClient.getUserById(chargingOrderListVO.getAppUserId()).getData();
- if (data2!=null&&data2.getVipId()!=null){
- TVip data1 = vipClient.getInfo1(data2.getVipId()).getData();
+ if (data3!=null&&data3.getVipId()!=null){
+ TVip data1 = data5.stream().filter(e->e.getId().equals(data3.getVipId())).findFirst().orElse(null);
if (data1!=null){
tChargingOrderExport.setVipType(data1.getName());
}
@@ -246,15 +252,13 @@
tChargingOrderExport.setDeviceCode(data4.getCode());
}
tChargingOrderExport.setAccountType("个人");
- List<TAppUserCar> data1 = appUserCarClient.getCarByIds(Arrays.asList(chargingOrderListVO.getAppUserCarId())).getData();
- if (data1!=null&&(!data1.isEmpty())){
- tChargingOrderExport.setCarNumber(data1.get(0).getLicensePlate());
- tChargingOrderExport.setCarType(data1.get(0).getVehicleModel());
- tChargingOrderExport.setCarBrand(data1.get(0).getVehicleBrand());
-
-
+ TAppUserCar tAppUserCar = data8.stream().filter(e -> e.getId().equals(chargingOrderListVO.getAppUserId())).findFirst().orElse(null);
+ if (tAppUserCar!=null){
+ tChargingOrderExport.setCarNumber(tAppUserCar.getLicensePlate());
+ tChargingOrderExport.setCarType(tAppUserCar.getVehicleModel());
+ tChargingOrderExport.setCarBrand(tAppUserCar.getVehicleBrand());
}
- tChargingOrderExport.setOrderCode(chargingOrderListVO.getCode());
+ tChargingOrderExport.setOrderCode(chargingOrderListVO.getStartChargeSeq());
tChargingOrderExport.setIsSingle("是");
tChargingOrderExport.setPayTime(chargingOrderListVO.getPayTime()+"");
tChargingOrderExport.setElectrovalenceSiteName("四川明星新能源科技有限公司");
--
Gitblit v1.7.1