diff --git a/src/main/java/com/example/building/controller/PublicOrderController.java b/src/main/java/com/example/building/controller/PublicOrderController.java index 106e7f7..9a9aa22 100644 --- a/src/main/java/com/example/building/controller/PublicOrderController.java +++ b/src/main/java/com/example/building/controller/PublicOrderController.java @@ -33,19 +33,14 @@ public class PublicOrderController { @GetMapping("/orders/{orderNo}") public Result> getOrderByNo( @PathVariable String orderNo, - @RequestParam(required = false) String customerId) { + @RequestParam String customerId) { // 查询订单 - com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper wrapper = + Order order = orderMapper.selectOne( new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper() - .eq(Order::getOrderNo, orderNo); - - // 如果提供了customerId,则校验 - if (customerId != null && !customerId.isEmpty()) { - wrapper.eq(Order::getCustomerId, customerId); - } - - Order order = orderMapper.selectOne(wrapper); + .eq(Order::getOrderNo, orderNo) + .eq(Order::getCustomerId, customerId) + ); if (order == null) { return Result.error("订单不存在");