律师端代码修改评价评论部分

alien-entity/src/main/java/shop/alien/entity/store/dto/OrderReviewDto.java

@@ -42,5 +42,8 @@ public class OrderReviewDto {
 
     @ApiModelProperty(value = "是否匿名评价，0:否，1:是")
     private Integer isAnonymous;
+
+    @ApiModelProperty(value = "用户id")
+    private Integer userId;
 }
 

alien-entity/src/main/java/shop/alien/entity/store/dto/ReviewCommentDto.java

@@ -19,5 +19,8 @@ public class ReviewCommentDto {
 
     @ApiModelProperty(value = "评论内容")
     private String commentContent;
+
+    @ApiModelProperty(value = "用户id")
+    private Integer userId;
 }
 

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

@@ -34,13 +34,12 @@ public class OrderReviewController {
     @ApiOperation("创建订单评价（只有订单用户才能评价）")
     @ApiOperationSupport(order = 1)
     @PostMapping("/create")
-    public R<OrderReview> createReview(@RequestBody OrderReviewDto reviewDto,
-                                        @TokenInfo UserLoginInfo userLoginInfo) {
-        log.info("OrderReviewController.createReview?reviewDto={}, userLoginInfo={}", reviewDto, userLoginInfo);
-        if (userLoginInfo == null) {
+    public R<OrderReview> createReview(@RequestBody OrderReviewDto reviewDto) {
+        log.info("OrderReviewController.createReview?reviewDto={}, ", reviewDto);
+        if (reviewDto.getUserId() == null) {
             return R.fail("用户未登录");
         }
-        return orderReviewService.createReview(reviewDto, userLoginInfo.getUserId());
+        return orderReviewService.createReview(reviewDto);
     }
 
     @ApiOperation("分页查询评价列表")
@@ -75,22 +74,25 @@ public class OrderReviewController {
 
     @ApiOperation("删除评价（删除评价时，会级联删除该评价下的所有评论和回复）")
     @ApiOperationSupport(order = 4)
-    @ApiImplicitParam(name = "reviewId", value = "评价ID", dataType = "int", paramType = "path", required = true)
-    @DeleteMapping("/delete/{reviewId}")
-    public R<Boolean> deleteReview(@PathVariable Integer reviewId,
-                                    @TokenInfo UserLoginInfo userLoginInfo) {
-        log.info("OrderReviewController.deleteReview?reviewId={}, userLoginInfo={}", reviewId, userLoginInfo);
-        if (userLoginInfo == null) {
+    @ApiImplicitParams({
+    @ApiImplicitParam(name = "reviewId", value = "评价ID", dataType = "int", paramType = "path", required = true),
+    @ApiImplicitParam(name = "userId", value = "用户ID", dataType = "int", paramType = "path", required = true)
+             })
+    @DeleteMapping("/delete/reviewId")
+    public R<Boolean> deleteReview(Integer reviewId,
+                                   Integer userId) {
+        log.info("OrderReviewController.deleteReview?reviewId={}, userId={}", reviewId, userId);
+        if (userId == null) {
             return R.fail("用户未登录");
         }
-        return orderReviewService.deleteReview(reviewId, userLoginInfo.getUserId());
+        return orderReviewService.deleteReview(reviewId, userId);
     }
 
     @ApiOperation("根据订单ID查询评价")
     @ApiOperationSupport(order = 5)
     @ApiImplicitParam(name = "orderId", value = "订单ID", dataType = "int", paramType = "path", required = true)
-    @GetMapping("/order/{orderId}")
-    public R<OrderReviewVo> getReviewByOrderId(@PathVariable Integer orderId) {
+    @GetMapping("/order/orderId")
+    public R<OrderReviewVo> getReviewByOrderId( Integer orderId) {
         log.info("OrderReviewController.getReviewByOrderId?orderId={}", orderId);
         return orderReviewService.getReviewByOrderId(orderId);
     }

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

@@ -34,13 +34,12 @@ public class ReviewCommentController {
     @ApiOperation("创建评论（其他用户对评价的评论）")
     @ApiOperationSupport(order = 1)
     @PostMapping("/create")
-    public R<ReviewComment> createComment(@RequestBody ReviewCommentDto commentDto,
-                                          @TokenInfo UserLoginInfo userLoginInfo) {
-        log.info("ReviewCommentController.createComment?commentDto={}, userLoginInfo={}", commentDto, userLoginInfo);
-        if (userLoginInfo == null) {
+    public R<ReviewComment> createComment(@RequestBody ReviewCommentDto commentDto) {
+        log.info("ReviewCommentController.createComment?commentDto={}", commentDto);
+        if (commentDto.getUserId() == null) {
             return R.fail("用户未登录");
         }
-        return reviewCommentService.createComment(commentDto, userLoginInfo.getUserId());
+        return reviewCommentService.createComment(commentDto);
     }
 
     @ApiOperation("根据评价ID查询评论列表")

alien-lawyer/src/main/java/shop/alien/lawyer/service/OrderReviewService.java

@@ -20,10 +20,10 @@ public interface OrderReviewService extends IService<OrderReview> {
      * 创建订单评价（只有订单用户才能评价）
      *
      * @param reviewDto 评价DTO
-     * @param userId 用户ID
+     *
      * @return R<OrderReview>
      */
-    R<OrderReview> createReview(OrderReviewDto reviewDto, Integer userId);
+    R<OrderReview> createReview(OrderReviewDto reviewDto);
 
     /**
      * 分页查询评价列表

alien-lawyer/src/main/java/shop/alien/lawyer/service/ReviewCommentService.java

@@ -20,10 +20,10 @@ public interface ReviewCommentService extends IService<ReviewComment> {
      * 创建评论（其他用户对评价的评论）
      *
      * @param commentDto 评论DTO
-     * @param userId 用户ID
+     *
      * @return R<ReviewComment>
      */
-    R<ReviewComment> createComment(ReviewCommentDto commentDto, Integer userId);
+    R<ReviewComment> createComment(ReviewCommentDto commentDto);
 
     /**
      * 根据评价ID查询评论列表

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/OrderReviewServiceImpl.java

@@ -42,8 +42,9 @@ public class OrderReviewServiceImpl extends ServiceImpl<OrderReviewMapper, Order
     private final CommentReplyMapper commentReplyMapper;
 
     @Override
-    public R<OrderReview> createReview(OrderReviewDto reviewDto, Integer userId) {
-        log.info("OrderReviewServiceImpl.createReview?reviewDto={}, userId={}", reviewDto, userId);
+    public R<OrderReview> createReview(OrderReviewDto reviewDto) {
+        log.info("OrderReviewServiceImpl.createReview?reviewDto={}", reviewDto);
+
 
         // 参数校验
         if (reviewDto == null) {
@@ -52,6 +53,7 @@ public class OrderReviewServiceImpl extends ServiceImpl<OrderReviewMapper, Order
         if (reviewDto.getOrderId() == null) {
             return R.fail("订单ID不能为空");
         }
+        Integer userId = reviewDto.getUserId();
         if (userId == null) {
             return R.fail("用户ID不能为空");
         }
@@ -92,8 +94,12 @@ public class OrderReviewServiceImpl extends ServiceImpl<OrderReviewMapper, Order
         review.setReviewContent(reviewDto.getReviewContent());
         
         // 处理评价图片
+//        if (reviewDto.getReviewImages() != null && !reviewDto.getReviewImages().isEmpty()) {
+//            review.setReviewImages(JSON.toJSONString(reviewDto.getReviewImages()));
+//        }
+
         if (reviewDto.getReviewImages() != null && !reviewDto.getReviewImages().isEmpty()) {
-            review.setReviewImages(JSON.toJSONString(reviewDto.getReviewImages()));
+            review.setReviewImages(String.join(",", reviewDto.getReviewImages()));
         }
         
         review.setIsAnonymous(reviewDto.getIsAnonymous() != null ? reviewDto.getIsAnonymous() : 0);

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/ReviewCommentServiceImpl.java

@@ -42,8 +42,8 @@ public class ReviewCommentServiceImpl extends ServiceImpl<ReviewCommentMapper, R
     }
 
     @Override
-    public R<ReviewComment> createComment(ReviewCommentDto commentDto, Integer userId) {
-        log.info("ReviewCommentServiceImpl.createComment?commentDto={}, userId={}", commentDto, userId);
+    public R<ReviewComment> createComment(ReviewCommentDto commentDto) {
+        log.info("ReviewCommentServiceImpl.createComment?commentDto={}", commentDto);
 
         // 参数校验
         if (commentDto == null) {
@@ -55,6 +55,7 @@ public class ReviewCommentServiceImpl extends ServiceImpl<ReviewCommentMapper, R
         if (commentDto.getCommentContent() == null || commentDto.getCommentContent().trim().isEmpty()) {
             return R.fail("评论内容不能为空");
         }
+        Integer userId=commentDto.getUserId() ;
         if (userId == null) {
             return R.fail("用户ID不能为空");
         }