From 9380492f1821e0306ea4fa481b49e14bb09f433a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 04 三月 2025 10:16:10 +0800
Subject: [PATCH] 修改结束充电账单生成充电明细bug

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 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..896ddbc 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
@@ -88,13 +88,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;
@@ -132,8 +132,9 @@
         List<TChargingOrderExport> tChargingOrderExports = new ArrayList<>();
         List<ChargingOrderListVO> exportList = res.getExportList();
         int i = 0;
-        List<Site> data9 = siteClient.getSiteAll().getData();
         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()

--
Gitblit v1.7.1