From 83a1aa3133ce9c35fb428d0cdf4a84adda4ba3ac Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 24 四月 2024 16:33:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/boying/controller/OrderRecordController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/boying/controller/OrderRecordController.java b/src/main/java/com/boying/controller/OrderRecordController.java
index 90c6d2d..3b426cd 100644
--- a/src/main/java/com/boying/controller/OrderRecordController.java
+++ b/src/main/java/com/boying/controller/OrderRecordController.java
@@ -7,13 +7,17 @@
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;
import com.boying.service.OutParkService;
import com.boying.service.ParkService;
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;
@@ -29,8 +33,9 @@
import java.util.stream.Collectors;
@RestController
-@RequestMapping("orderrecord")
+@RequestMapping("ffzf/orderrecord")
@RequiredArgsConstructor
+@Tag(description = "ffzf/orderrecord" , name = "璁㈠崟鎺ュ彛" )
public class OrderRecordController {
private final OrderRecordService orderRecordService;
@@ -38,7 +43,40 @@
private final ParkService parkService;
private final UserService userService;
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page 鍒嗛〉瀵硅薄
+ * @param orderRecord 璁㈠崟琛�
+ * @return
+ */
+ @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)
+ .like(StringUtils.isNotBlank(orderRecord.getCarNo()),OrderRecord::getCarNo,orderRecord.getCarNo())
+ .isNotNull(OrderRecord::getPayCode)
+ .orderByDesc(OrderRecord::getCreateTime);
+ Page page1 = orderRecordService.page(page, wrapper);
+ List<OrderRecord> records = page1.getRecords();
+ for (OrderRecord record : records) {
+ if(record.getImgInId() != null){
+ record.setImgInPath("/ffzf/fileinfo/showImgById/"+record.getImgInId());
+ }
+ if(record.getImgOutId() != null){
+ record.setImgOutPath("/ffzf/fileinfo/showImgById/"+record.getImgOutId());
+ }
+ }
+ page1.setRecords(records);
+ return R.ok(page1);
+ }
+
+
@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<>();
@@ -67,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<>();
@@ -88,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