admin1/jiangchengfeiyi-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新了写真预约特殊产品处理

Browse Source
This commit is contained in:
chen-xin-zhi 2025-03-11 09:21:52 +08:00
parent 8bd52067ae
commit fba1b82672
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/cultural/heritage/controller/global/GlobalController.java
View File

@ -63,8 +63,8 @@ public class GlobalController {
Date endOfDay = DateUtil.endOfDay(new Date()); // 今天的结束时间（23:59:59） Date endOfDay = DateUtil.endOfDay(new Date()); // 今天的结束时间（23:59:59）
QueryWrapper<Order> orderQueryWrapper = new QueryWrapper<>(); QueryWrapper<Order> orderQueryWrapper = new QueryWrapper<>();
orderQueryWrapper.between("updateTime", startOfDay, endOfDay) orderQueryWrapper.between("updateTime", startOfDay, endOfDay);
.and(wrapper -> wrapper.in("orderStatus", orderStatusList)); orderQueryWrapper.in("orderStatus", orderStatusList);
List<Order> orderList = orderService.list(orderQueryWrapper); List<Order> orderList = orderService.list(orderQueryWrapper);
@ -89,9 +89,8 @@ public class GlobalController {
QueryWrapper<AdvanceOrder> advanceOrderQueryWrapper = new QueryWrapper<>(); QueryWrapper<AdvanceOrder> advanceOrderQueryWrapper = new QueryWrapper<>();
orderQueryWrapper.between("updateTime", startOfDay, endOfDay) advanceOrderQueryWrapper.between("updateTime", startOfDay, endOfDay);
.and(wrapper -> wrapper.eq("orderStatus", OrderStatusConstant.PENDING_SHIPMENT) advanceOrderQueryWrapper.in("orderStatus", OrderStatusConstant.PENDING_SHIPMENT, OrderStatusConstant.TRANSACTION_SUCCESSFUL);
.or().eq("orderStatus", OrderStatusConstant.TRANSACTION_SUCCESSFUL));
List<AdvanceOrder> advanceOrderList = advanceOrderService.list(advanceOrderQueryWrapper); List<AdvanceOrder> advanceOrderList = advanceOrderService.list(advanceOrderQueryWrapper);
BigDecimal advanceTotalAmount = new BigDecimal("0.00"); BigDecimal advanceTotalAmount = new BigDecimal("0.00");
@ -102,6 +101,7 @@ public class GlobalController {
map.put("今日写真预约订单数", advanceOrderList.size()); map.put("今日写真预约订单数", advanceOrderList.size());
map.put("今日写真预约类订单营业额", advanceTotalAmount); map.put("今日写真预约类订单营业额", advanceTotalAmount);
// 获取所有待支付订单 // 获取所有待支付订单
List<Order> pendingPaymentOrderList = orderList.stream().filter(order -> order.getOrderStatus().equals(OrderStatusConstant.PENDING_PAYMENT)).toList(); List<Order> pendingPaymentOrderList = orderList.stream().filter(order -> order.getOrderStatus().equals(OrderStatusConstant.PENDING_PAYMENT)).toList();
// 获取待发货实体类订单 // 获取待发货实体类订单

1
src/main/resources/application.yml
View File

@ -54,6 +54,7 @@ spring:
servlet: servlet:
multipart: multipart:
max-file-size: 20MB max-file-size: 20MB
max-request-size: 20MB
springdoc: springdoc: