From 1728e20ab5ee54250df4e9f19e4966dfc61e8984 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期二, 12 八月 2025 14:51:49 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/controller/MobileController.java | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java index c33a054..fd69bdf 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -650,17 +650,23 @@ } - @GetMapping("/getReviewList/{orderNo}") - public synchronized R getReviewList(@PathVariable("orderNo") String orderNo) { - List<Review> reviewList = reviewService.selectList(new EntityWrapper<Review>().like("order_no", orderNo)); + @GetMapping("/getReviewList") + public synchronized R getReviewList(@RequestParam(value = "orderNo", required = false) String orderNo) { + List<Review> reviewList; + if (Cools.isEmpty(orderNo)) { + reviewList = reviewService.selectList(new EntityWrapper<Review>().in("settle", 1, 2)); + }else { + reviewList = reviewService.selectList(new EntityWrapper<Review>().like("order_no", orderNo).in("settle", 1, 2)); + } List<String> collect = reviewList.stream().map(Review::getOrderNo).collect(Collectors.toList()); return R.ok(collect); } @GetMapping("/getReviewDetlByOrderNo/{orderNo}") - public synchronized R getReviewDetlByOrderNo(@PathVariable("orderNo") String orderNo) { - List<ReviewDetl> reviewList = reviewDetlService.selectList(new EntityWrapper<ReviewDetl>().eq("order_no", orderNo).ne("inspect", 1)); + public synchronized R getReviewDetlByOrderNo(@PathVariable(value = "orderNo") String orderNo) { + //.ne("inspect", 1) + List<ReviewDetl> reviewList = reviewDetlService.selectList(new EntityWrapper<ReviewDetl>().eq("order_no", orderNo)); return R.ok(reviewList); } -- Gitblit v1.9.1