From b784514b4c5414e3deb121f723fae6d8d875f4e5 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期一, 10 七月 2023 16:52:38 +0800
Subject: [PATCH] 提交更新

---
 src/main/java/com/boying/controller/OrderRecordController.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/boying/controller/OrderRecordController.java b/src/main/java/com/boying/controller/OrderRecordController.java
index b20267f..7f7204a 100644
--- a/src/main/java/com/boying/controller/OrderRecordController.java
+++ b/src/main/java/com/boying/controller/OrderRecordController.java
@@ -7,6 +7,7 @@
 import com.boying.common.R;
 import com.boying.entity.OrderRecord;
 import com.boying.entity.OutPark;
+import com.boying.entity.Park;
 import com.boying.entity.User;
 import com.boying.entity.vo.OrderRecordVo;
 import com.boying.service.OrderRecordService;
@@ -120,7 +121,12 @@
                 List<OutPark> value = objectListEntry.getValue();
                 Double collect1 = value.stream().collect(Collectors.summingDouble(OutPark::getPrice));
                 Map<String,Object> map  = new HashMap<>();
-                map.put("parkName",parkService.getById(key).getName());
+                Park byId = parkService.getById(key);
+                if(byId != null){
+                    map.put("parkName",byId.getName());
+                }else {
+                    map.put("parkName","鏈煡鍋滆溅鍦�");
+                }
                 map.put("orderNum",value.size());
                 map.put("orderMoney",collect1);
                 resultList.add(map);

--
Gitblit v1.9.1