解决冲突

alien-lawyer/src/main/java/shop/alien/lawyer/controller/OrderReviewController.java

@@ -41,60 +41,6 @@ public class OrderReviewController {
         return orderReviewService.createReview(reviewDto);
     }
 
-    @ApiOperation("获取评价详情（包含评论和回复）")
-    @ApiOperationSupport(order = 3)
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "reviewId", value = "评价ID", dataType = "int", paramType = "query", required = true),
-            @ApiImplicitParam(name = "currentUserId", value = "当前用户ID（用于判断是否已点赞）", dataType = "int", paramType = "query")
-    })
-    @GetMapping("/detail/reviewId")
-    public R<OrderReviewDetailVo> getReviewDetail(
-            @RequestParam Integer reviewId,
-            @RequestParam(required = false) Integer currentUserId) {
-        log.info("OrderReviewController.getReviewDetail?reviewId={}, currentUserId={}", reviewId, currentUserId);
-        if (reviewId == null) {
-            return R.fail("评价ID不能为空");
-        }
-        return orderReviewService.getReviewDetail(reviewId, currentUserId);
-    }
-
-    @ApiOperation("点赞评价")
-    @ApiOperationSupport(order = 8)
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "reviewId", value = "评价ID", dataType = "int", paramType = "query", required = true),
-            @ApiImplicitParam(name = "userId", value = "用户ID", dataType = "int", paramType = "query", required = true)
-    })
-    @PostMapping("/like")
-    public R<Boolean> likeReview(@RequestBody OrderReview orderReview) {
-        Integer reviewId = orderReview.getId();
-        Integer userId = orderReview.getUserId();
-        log.info("OrderReviewController.likeReview?reviewId={}, userId={}", reviewId, userId);
-        if (userId == null) {
-            return R.fail("用户未登录");
-        }
-        if (reviewId == null) {
-            return R.fail("评价ID不能为空");
-        }
-        return orderReviewService.likeReview(reviewId, userId);
-    }
-
-    @ApiOperation("取消点赞评价")
-    @ApiOperationSupport(order = 9)
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "reviewId", value = "评价ID", dataType = "int", paramType = "query", required = true),
-            @ApiImplicitParam(name = "userId", value = "用户ID", dataType = "int", paramType = "query", required = true)
-    })
-    @PostMapping("/cancelLike")
-    public R<Boolean> cancelLikeReview(@RequestBody OrderReview orderReview) {
-        Integer reviewId = orderReview.getId();
-        Integer userId = orderReview.getUserId();
-        log.info("OrderReviewController.cancelLikeReview?reviewId={}, userId={}", reviewId, userId);
-        if (userId == null) {
-            return R.fail("用户未登录");
-        }
-        return orderReviewService.cancelLikeReview(reviewId, userId);
-    }
-
     @ApiOperation("分页查询评价列表")
     @ApiOperationSupport(order = 2)
     @ApiImplicitParams({
@@ -205,28 +151,38 @@ public class OrderReviewController {
         return orderReviewService.getMyReviewList(page, size, userId, currentUserId);
     }
 
-    @ApiOperation("根据律师ID和类型分页查询评价列表（不包含评论）")
-    @ApiOperationSupport(order = 11)
+    @ApiOperation("点赞评价")
+    @ApiOperationSupport(order = 8)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "page", value = "页数（默认1）", dataType = "int", paramType = "query"),
-            @ApiImplicitParam(name = "size", value = "页容（默认10）", dataType = "int", paramType = "query"),
-            @ApiImplicitParam(name = "lawyerUserId", value = "律师用户ID", dataType = "int", paramType = "query", required = true),
-            @ApiImplicitParam(name = "type", value = "查询分类（1：好评，2：中评，3：差评，4：有图，为空时返回全部）", dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "currentUserId", value = "当前用户ID（用于判断是否已点赞）", dataType = "int", paramType = "query")
+            @ApiImplicitParam(name = "reviewId", value = "评价ID", dataType = "int", paramType = "query", required = true),
+            @ApiImplicitParam(name = "userId", value = "用户ID", dataType = "int", paramType = "query", required = true)
     })
-    @GetMapping("/list/byLawyerAndType")
-    public R<IPage<OrderReviewVo>> getReviewListByLawyerAndType(
-            @RequestParam(defaultValue = "1") int page,
-            @RequestParam(defaultValue = "10") int size,
-            @RequestParam Integer lawyerUserId,
-            @RequestParam(required = false) Integer type,
-            @RequestParam(required = false) Integer currentUserId) {
-        log.info("OrderReviewController.getReviewListByLawyerAndType?page={}, size={}, lawyerUserId={}, type={}, currentUserId={}",
-                page, size, lawyerUserId, type, currentUserId);
-        if (lawyerUserId == null) {
-            return R.fail("律师ID不能为空");
+    @PostMapping("/like")
+    public R<Boolean> likeReview(
+            @RequestParam Integer reviewId,
+            @RequestParam Integer userId) {
+        log.info("OrderReviewController.likeReview?reviewId={}, userId={}", reviewId, userId);
+        if (userId == null) {
+            return R.fail("用户未登录");
         }
-        return orderReviewService.getReviewListByLawyerAndType(page, size, lawyerUserId, type, currentUserId);
+        return orderReviewService.likeReview(reviewId, userId);
+    }
+
+    @ApiOperation("取消点赞评价")
+    @ApiOperationSupport(order = 9)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "reviewId", value = "评价ID", dataType = "int", paramType = "query", required = true),
+            @ApiImplicitParam(name = "userId", value = "用户ID", dataType = "int", paramType = "query", required = true)
+    })
+    @PostMapping("/cancelLike")
+    public R<Boolean> cancelLikeReview(
+            @RequestParam Integer reviewId,
+            @RequestParam Integer userId) {
+        log.info("OrderReviewController.cancelLikeReview?reviewId={}, userId={}", reviewId, userId);
+        if (userId == null) {
+            return R.fail("用户未登录");
+        }
+        return orderReviewService.cancelLikeReview(reviewId, userId);
     }
 }