From 082b9ab8643bc5e81f2e70b8e9400fdaba62e686 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 03 九月 2025 17:19:18 +0800
Subject: [PATCH] 修改小程序首页查询重复bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 76 ++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 39 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 c10320a..1022a54 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,24 @@
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.api.vo.SettlementTotalVO;
+import com.ruoyi.order.export.TChargingOrderExport;
import com.ruoyi.order.service.*;
+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,12 +44,10 @@
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;
@@ -85,16 +67,19 @@
@Resource
private TChargingOrderService chargingOrderService;
@Resource
+ private TChargingOrderRefundService chargingOrderRefundService;
+
+ @Resource
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;
@@ -126,20 +111,17 @@
@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.getExportList();
- int i = 0;
- List<Site> data9 = siteClient.getSiteAll().getData();
+ 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<TChargingOrderAccountingStrategy> stageCostAll = tChargingOrderAccountingStrategyService.list();
List<TVip> data5 = vipClient.getAllVip().getData();
List<TAppUserCar> data8 = appUserCarClient.getAllCar().getData();
for (ChargingOrderListVO chargingOrderListVO : exportList) {
@@ -175,14 +157,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());
@@ -233,6 +229,8 @@
long between = ChronoUnit.SECONDS.between(startTime, endTime);
tChargingOrderExport.setCumulativeChargingTime((between*60)+"");
}
+ tChargingOrderExport.setRechargeAmount(chargingOrderListVO.getRechargeAmount().toString());
+ tChargingOrderExport.setRefundAmount(chargingOrderListVO.getRefundAmount().toString());
tChargingOrderExport.setStartSoc(chargingOrderListVO.getStartSoc());
tChargingOrderExport.setEndtSoc(chargingOrderListVO.getEndSoc());
tChargingOrderExport.setIsSoc("否");
@@ -261,7 +259,7 @@
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