From 7bc78d8f70a4d11e46f8bd640228804a3dd0dc68 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 22 四月 2024 10:52:29 +0800
Subject: [PATCH] Merge branch 'master2'
---
src/main/java/com/boying/controller/OrderRecordController.java | 16 ++++++++++++++--
1 files changed, 14 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..3b426cd 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,8 @@
import com.boying.service.UserService;
import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.GetMapping;
@@ -32,6 +35,7 @@
@RestController
@RequestMapping("ffzf/orderrecord")
@RequiredArgsConstructor
+@Tag(description = "ffzf/orderrecord" , name = "璁㈠崟鎺ュ彛" )
public class OrderRecordController {
private final OrderRecordService orderRecordService;
@@ -47,12 +51,13 @@
*/
@ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
@PostMapping("/findPage" )
+ @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public R getOrderRecordPage(Page page, OrderRecord orderRecord) {
QueryWrapper<OrderRecord> wrapper = new QueryWrapper<>();
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);
@@ -71,6 +76,7 @@
@PostMapping("/getByCarNo")
+ @Operation(summary = "閫氳繃杞︾墝鍙锋湀浠藉垎椤垫煡璇�" , description = "閫氳繃杞︾墝鍙锋湀浠藉垎椤垫煡璇�" )
public Object getByCarNo(Page page,String carNo,String month,String phone) {
List<OrderRecordVo> recordVos = new ArrayList<>();
QueryWrapper<OrderRecord> wrapper = new QueryWrapper<>();
@@ -99,6 +105,7 @@
}
@PostMapping("/findCountPage")
+ @Operation(summary = "鏌ヨ鍋滆溅鍦鸿鍗曢噾棰濈粺璁�" , description = "鏌ヨ鍋滆溅鍦鸿鍗曢噾棰濈粺璁�" )
public Object findCountPage(Integer parkId,String startTime,String endTime) throws ParseException {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
QueryWrapper<OutPark> wrapper = new QueryWrapper<>();
@@ -120,7 +127,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