From fba1b826726e130dd6fb72151fe805ebf87b955f Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Tue, 11 Mar 2025 09:21:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E5=86=99=E7=9C=9F?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E7=89=B9=E6=AE=8A=E4=BA=A7=E5=93=81=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heritage/controller/global/GlobalController.java | 10 +++++----- src/main/resources/application.yml | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cultural/heritage/controller/global/GlobalController.java b/src/main/java/com/cultural/heritage/controller/global/GlobalController.java index 5165650..3ed65f5 100644 --- a/src/main/java/com/cultural/heritage/controller/global/GlobalController.java +++ b/src/main/java/com/cultural/heritage/controller/global/GlobalController.java @@ -63,8 +63,8 @@ public class GlobalController { Date endOfDay = DateUtil.endOfDay(new Date()); // 今天的结束时间（23:59:59） QueryWrapper orderQueryWrapper = new QueryWrapper<>(); - orderQueryWrapper.between("updateTime", startOfDay, endOfDay) - .and(wrapper -> wrapper.in("orderStatus", orderStatusList)); + orderQueryWrapper.between("updateTime", startOfDay, endOfDay); + orderQueryWrapper.in("orderStatus", orderStatusList); List orderList = orderService.list(orderQueryWrapper); @@ -89,9 +89,8 @@ public class GlobalController { QueryWrapper advanceOrderQueryWrapper = new QueryWrapper<>(); - orderQueryWrapper.between("updateTime", startOfDay, endOfDay) - .and(wrapper -> wrapper.eq("orderStatus", OrderStatusConstant.PENDING_SHIPMENT) - .or().eq("orderStatus", OrderStatusConstant.TRANSACTION_SUCCESSFUL)); + advanceOrderQueryWrapper.between("updateTime", startOfDay, endOfDay); + advanceOrderQueryWrapper.in("orderStatus", OrderStatusConstant.PENDING_SHIPMENT, OrderStatusConstant.TRANSACTION_SUCCESSFUL); List advanceOrderList = advanceOrderService.list(advanceOrderQueryWrapper); BigDecimal advanceTotalAmount = new BigDecimal("0.00"); @@ -102,6 +101,7 @@ public class GlobalController { map.put("今日写真预约订单数", advanceOrderList.size()); map.put("今日写真预约类订单营业额", advanceTotalAmount); + // 获取所有待支付订单 List pendingPaymentOrderList = orderList.stream().filter(order -> order.getOrderStatus().equals(OrderStatusConstant.PENDING_PAYMENT)).toList(); // 获取待发货实体类订单 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 44cd4a9..44ae880 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -54,6 +54,7 @@ spring: servlet: multipart: max-file-size: 20MB + max-request-size: 20MB springdoc: