From bac87061c69aaca6c23a84e08f76f3dfd0c77c4a Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期五, 11 十月 2024 15:46:32 +0800
Subject: [PATCH] fix:更新出场
---
src/main/java/com/boying/controller/OrderRecordController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/boying/controller/OrderRecordController.java b/src/main/java/com/boying/controller/OrderRecordController.java
index b20267f..f9b88e2 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;
@@ -15,6 +16,7 @@
import com.boying.service.UserService;
import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
+
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.GetMapping;
@@ -52,7 +54,7 @@
wrapper.lambda()
.eq(OrderRecord::getType,orderRecord.getType())
.eq(OrderRecord::getStatus,1)
- .eq(StringUtils.isNotBlank(orderRecord.getCarNo()),OrderRecord::getCarNo,orderRecord.getCarNo())
+ .like(StringUtils.isNotBlank(orderRecord.getCarNo()),OrderRecord::getCarNo,orderRecord.getCarNo())
.isNotNull(OrderRecord::getPayCode)
.orderByDesc(OrderRecord::getCreateTime);
Page page1 = orderRecordService.page(page, wrapper);
@@ -120,7 +122,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