From 858d8b41a967c6267760aca0ae4bbfccc3b81654 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 02 十一月 2024 20:32:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
index aba788a..845e200 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -101,6 +101,7 @@
@Resource
private AppUserCarClient appUserCarClient;
+
@Autowired
public TApplyChargingPileController(TApplyChargingPileService applyChargingPileService, TokenService tokenService, RedisService redisService) {
this.applyChargingPileService = applyChargingPileService;
@@ -269,10 +270,10 @@
@ApiOperation(value = "下载-已出账", tags = {"管理后台-充电算账单"})
@PutMapping("/downloadBill")
@Log(title = "【充电算账单】下载算账单", businessType = BusinessType.EXPORT)
- public R downloadBill(@RequestBody ExportUidDto uid, HttpServletResponse response)
+ public R downloadBill(@RequestBody String uid, HttpServletResponse response)
{
ChargingListQuery chargingListQuery = new ChargingListQuery();
- chargingListQuery.setUid(uid.getUid());
+ chargingListQuery.setUid(uid);
chargingListQuery.setPageCurr(1);
chargingListQuery.setPageSize(99999);
ChargingBillVO data = chargingOrderClient.chargingBillListR(chargingListQuery).getData();
@@ -314,6 +315,28 @@
{ dto.setPageCurr(1);
dto.setPageSize(99999999);
AccountListVO data = orderClient.accountBillList(dto).getData();
+ List<TChargingOrder> collect = data.getOrderList().stream().distinct().collect(Collectors.toList());
+ int i = 1;
+ BigDecimal bigDecimal = new BigDecimal("0");
+
+ for (TChargingOrder chargingOrder : collect) {
+ bigDecimal = bigDecimal.add(chargingOrder.getPaymentAmount());
+ if (chargingOrder.getRechargePaymentType()!=null){
+ switch (chargingOrder.getRechargePaymentType()){
+ case 1:
+ chargingOrder.setPayPlatform("微信");
+ chargingOrder.setRechargePaymentType1("微信小程序支付");
+ break;
+ case 2:
+ chargingOrder.setPayPlatform("支付宝");
+ chargingOrder.setRechargePaymentType1("支付宝小程序支付");
+ break;
+ }
+ }
+ chargingOrder.setXuhao(i);
+ i++;
+ }
+ collect.get(0).setTotal(bigDecimal);
try {
response.setCharacterEncoding(Constants.UTF8);
response.setContentType("application/vnd.ms-excel");
@@ -331,7 +354,7 @@
try (ExcelWriter excelWriter = excelWriterBuilder.withTemplate(stream).build()) {
WriteSheet writeSheet = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).build();
- excelWriter.fill(new FillWrapper("data1", data.getList().getRecords()), fillConfig, writeSheet);
+ excelWriter.fill(new FillWrapper("data1", collect), fillConfig, writeSheet);
excelWriter.finish();
} catch (Exception e) {
return R.fail("excel导出失败！");
@@ -348,8 +371,6 @@
public R downloadSettlementTotal(@RequestBody ExportUidDto uid,HttpServletResponse response)
{
SettlementTotalVO data = chargingOrderClient.settlementTotalR(uid.getTime()).getData();
-
-
try {
response.setCharacterEncoding(Constants.UTF8);
response.setContentType("application/vnd.ms-excel");
@@ -524,9 +545,18 @@
if (chargingOrder.getCode()!=null){
List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrder.getCode()).getData();
if (data6!=null && !data6.isEmpty()){
- // 第一条数据soc为开始 最后一条数据soc为结束soc
- settlementExportVO.setStartSoc(data6.get(0).getSoc()+"%");
- settlementExportVO.setEndSoc(data6.get(data6.size()-1).getSoc()+"%");
+ int min = 100;
+ int max = 0;
+ for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : data6) {
+ if (uploadRealTimeMonitoringData.getSoc()>max){
+ max = uploadRealTimeMonitoringData.getSoc();
+ }
+ if (uploadRealTimeMonitoringData.getSoc()!=0 &&uploadRealTimeMonitoringData.getSoc()<min){
+ min = uploadRealTimeMonitoringData.getSoc();
+ }
+ }
+ settlementExportVO.setEndSoc(max+"");
+ settlementExportVO.setStartSoc(min+"");
}
}
settlementExportVO.setIsSoc("否");
--
Gitblit v1.7.1