From fb3480484fee1ec8d07058e5058cd3214f051ade Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 11 Apr 2023 17:00:44 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=8F=AF=E7=94=B3=E8=AF=B7=E5=BC=80=E7=A5=A8=E7=9A=84=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/api/uniapp/OrderController.java | 4 ++++ .../src/main/java/com/jsowell/service/OrderService.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java index 06fa88ef6..52f69fe58 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java @@ -247,6 +247,7 @@ public class OrderController extends BaseController { /** * 查询未开发票订单 * 时间限制60天内 + * http://localhost:8080/uniapp/order/queryUninvoicedOrderList */ @PostMapping("/queryUninvoicedOrderList") public RestApiResponse queryUninvoicedOrderList(HttpServletRequest request, @RequestBody QueryOrderDTO dto) { @@ -259,6 +260,9 @@ public class OrderController extends BaseController { } List list = orderService.queryUninvoicedOrderList(dto); response = new RestApiResponse<>(ImmutableMap.of("list", list)); + } catch (BusinessException e) { + logger.error("查询未开发票订单 warn", e); + response = new RestApiResponse<>(e.getCode(), e.getMessage()); } catch (Exception e){ logger.error("查询未开发票订单 error", e); response = new RestApiResponse<>("00300003", "查询未开发票订单异常"); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 056d9c5ac..ec59bc290 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -994,6 +994,9 @@ public class OrderService { orderList = orderList.stream() .filter(x -> x.getOrderAmount().compareTo(BigDecimal.ZERO) > 0) .collect(Collectors.toList()); + if (CollectionUtils.isEmpty(orderList)) { + return orderList; + } // 查询最近60天申请开票记录 QueryInvoiceRecordDTO build = QueryInvoiceRecordDTO.builder()