From 1cd4e2ec779945e6882a85799d7cd5aefa133e6f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 九月 2024 09:47:28 +0800
Subject: [PATCH] 9.10

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TParkingRecordServiceImpl.java |   18 ++++++++++++++----
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java               |    2 +-
 ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml                  |    1 +
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TParkingRecordServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TParkingRecordServiceImpl.java
index 8e6f6e9..f897f64 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TParkingRecordServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TParkingRecordServiceImpl.java
@@ -50,16 +50,26 @@
         // 查询站点的停车场id
         if(Objects.nonNull(query.getSiteId())){
             Site site = siteMapper.selectById(query.getSiteId());
-            List<TParkingLot> tParkingLots = parkingLotMapper.selectList(Wrappers.lambdaQuery(TParkingLot.class)
-                    .eq(TParkingLot::getSiteId, site.getId()));
-            List<Integer> lotIds = tParkingLots.stream().map(TParkingLot::getId).collect(Collectors.toList());
-            query.setLotIds(lotIds);
+            if (site!=null){
+                List<TParkingLot> tParkingLots = parkingLotMapper.selectList(Wrappers.lambdaQuery(TParkingLot.class)
+                        .eq(TParkingLot::getSiteId, site.getId()));
+                List<Integer> lotIds = tParkingLots.stream().map(TParkingLot::getId).collect(Collectors.toList());
+                query.setLotIds(lotIds);
+            }
+
         }
         PageInfo<TParkingRecordVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
         List<TParkingRecordVO> list = this.baseMapper.pageList(query,pageInfo);
         pageInfo.setRecords(list);
         // 查询总数
         TParkingRecordPageInfoVO infoVO = this.baseMapper.getParkingRecordCount(query);
+        if (infoVO==null){
+            infoVO = new TParkingRecordPageInfoVO();
+            infoVO.setTimeoutAmountSum(new BigDecimal("0"));
+            infoVO.setOrderCount(0);
+            infoVO.setParkingDurationSum(0);
+            infoVO.setFeeDurationSum(0);
+        }
         infoVO.setParkingRecordVOS(pageInfo);
         return infoVO;
     }
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml
index 3bc729d..bebe052 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml
@@ -79,6 +79,7 @@
             </if>
             AND status = 3
         </where>
+        group by create_time
         ORDER BY create_time DESC
     </select>
 
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 8183576..6bd6c1c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1217,7 +1217,7 @@
 						carId.add(chargingOrderListVO.getAppUserCarId());
 						if (!carId.isEmpty()){
 							List<TAppUserCar> data4 = appUserCarClient.getCarByIds(carId).getData();
-							if (!data4.isEmpty()) chargingOrderListVO.setLicensePlate(data4.get(0).getLicensePlate());
+							if (data4!=null && !data4.isEmpty()) chargingOrderListVO.setLicensePlate(data4.get(0).getLicensePlate());
 						}
 					}
 					if (data3 != null) chargingOrderListVO.setPhone(data3.getPhone());

--
Gitblit v1.7.1