From 19d7917b399bf3f28228dd72da5c37d13ed86753 Mon Sep 17 00:00:00 2001 From: Agent Date: Sun, 29 Mar 2026 07:25:12 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=AC=E5=BC=80=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81=E4=B8=8D=E4=BC=A0customerI?= =?UTF-8?q?d=EF=BC=88=E5=85=BC=E5=AE=B9=E6=97=A7=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PublicOrderController.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/example/building/controller/PublicOrderController.java b/src/main/java/com/example/building/controller/PublicOrderController.java index 2aad1de..106e7f7 100644 --- a/src/main/java/com/example/building/controller/PublicOrderController.java +++ b/src/main/java/com/example/building/controller/PublicOrderController.java @@ -33,17 +33,22 @@ public class PublicOrderController { @GetMapping("/orders/{orderNo}") public Result> getOrderByNo( @PathVariable String orderNo, - @RequestParam String customerId) { + @RequestParam(required = false) String customerId) { // 查询订单 - Order order = orderMapper.selectOne( + com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper wrapper = new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper() - .eq(Order::getOrderNo, orderNo) - .eq(Order::getCustomerId, customerId) - ); + .eq(Order::getOrderNo, orderNo); + + // 如果提供了customerId，则校验 + if (customerId != null && !customerId.isEmpty()) { + wrapper.eq(Order::getCustomerId, customerId); + } + + Order order = orderMapper.selectOne(wrapper); if (order == null) { - return Result.error("订单不存在或客户信息不匹配"); + return Result.error("订单不存在"); } // 查询订单明细