维护评论表，和评价表表名

alien-entity/src/main/java/shop/alien/entity/store/OrderReview.java

@@ -18,7 +18,7 @@ import java.util.Date;
  */
 @Data
 @JsonInclude
-@TableName("order_review")
+@TableName("lawyer_order_review")
 @ApiModel(value = "OrderReview对象", description = "订单评价")
 public class OrderReview {
 

alien-entity/src/main/java/shop/alien/entity/store/ReviewComment.java

@@ -18,7 +18,7 @@ import java.util.Date;
  */
 @Data
 @JsonInclude
-@TableName("review_comment")
+@TableName("lawyer_review_comment")
 @ApiModel(value = "ReviewComment对象", description = "评价评论")
 public class ReviewComment {
 
@@ -31,8 +31,12 @@ public class ReviewComment {
     private Integer reviewId;
 
     @ApiModelProperty(value = "评论用户ID")
-    @TableField("user_id")
-    private Integer userId;
+    @TableField("send_user_id")
+    private Integer sendUserId;
+
+    @ApiModelProperty(value = "接收用户ID")
+    @TableField("receive_user_id")
+    private Integer receiveUserId;
 
     @ApiModelProperty(value = "评论内容")
     @TableField("comment_content")
@@ -46,6 +50,14 @@ public class ReviewComment {
     @TableField("reply_count")
     private Integer replyCount;
 
+    @ApiModelProperty(value = "首评标记, 0:是, 1:否")
+    @TableField("head_type")
+    private Integer headType;
+
+    @ApiModelProperty(value = "首评ID（仅子评论存在该属性）")
+    @TableField("head_id")
+    private Integer headId;
+
     @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
     @TableField("delete_flag")
     @TableLogic
@@ -61,7 +73,7 @@ public class ReviewComment {
     private Integer createdUserId;
 
     @ApiModelProperty(value = "修改时间")
-    @TableField(value = "updated_time", fill = FieldFill.UPDATE)
+    @TableField(value = "updated_time", fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updatedTime;
 

alien-entity/src/main/java/shop/alien/entity/store/vo/ReviewCommentVo.java

@@ -25,7 +25,10 @@ public class ReviewCommentVo {
     private Integer reviewId;
 
     @ApiModelProperty(value = "评论用户ID")
-    private Integer userId;
+    private Integer sendUserId;
+
+    @ApiModelProperty(value = "接收用户ID")
+    private Integer receiveUserId;
 
     @ApiModelProperty(value = "评论用户名称")
     private String userName;
@@ -42,6 +45,12 @@ public class ReviewCommentVo {
     @ApiModelProperty(value = "回复数")
     private Integer replyCount;
 
+    @ApiModelProperty(value = "首评标记, 0:是, 1:否")
+    private Integer headType;
+
+    @ApiModelProperty(value = "首评ID（仅子评论存在该属性）")
+    private Integer headId;
+
     @ApiModelProperty(value = "当前用户是否已点赞，0:未点赞，1:已点赞")
     private Integer isLiked;
 

alien-entity/src/main/resources/mapper/CommentAppealMapper.xml

@@ -86,7 +86,7 @@
             orv.created_time AS review_time,
             orv.review_images
         FROM comment_appeals ca
-        LEFT JOIN order_review orv ON orv.id = ca.comment_id AND orv.delete_flag = 0
+        LEFT JOIN lawyer_order_review orv ON orv.id = ca.comment_id AND orv.delete_flag = 0
         LEFT JOIN life_user lu ON lu.id = orv.user_id AND lu.delete_flag = 0
         WHERE ca.delete_flag = 0
         <if test="status != null">
@@ -132,7 +132,7 @@
             orv.created_time AS review_time,
             orv.review_images
         FROM comment_appeals ca
-        LEFT JOIN order_review orv ON orv.id = ca.comment_id AND orv.delete_flag = 0
+        LEFT JOIN lawyer_order_review orv ON orv.id = ca.comment_id AND orv.delete_flag = 0
         LEFT JOIN life_user lu ON lu.id = orv.user_id AND lu.delete_flag = 0
         WHERE ca.delete_flag = 0
         AND ca.id = #{id}
@@ -178,7 +178,7 @@
             orv.created_time AS review_time,
             orv.review_images
         FROM comment_appeals ca
-        LEFT JOIN order_review orv ON orv.id = ca.comment_id AND orv.delete_flag = 0
+        LEFT JOIN lawyer_order_review orv ON orv.id = ca.comment_id AND orv.delete_flag = 0
         LEFT JOIN life_user lu ON lu.id = orv.user_id AND lu.delete_flag = 0
         LEFT JOIN lawyer_user lu2 ON lu2.id = orv.lawyer_user_id AND lu2.delete_flag = 0
         WHERE ca.delete_flag = 0

alien-entity/src/main/resources/mapper/OrderReviewMapper.xml

@@ -59,7 +59,7 @@
                 ELSE 0
             END AS is_liked,
             orv.created_time
-        FROM order_review orv
+        FROM lawyer_order_review orv
         LEFT JOIN life_user lu ON lu.id = orv.user_id AND lu.delete_flag = 0
         LEFT JOIN lawyer_user lu2 ON lu2.id = orv.lawyer_user_id AND lu2.delete_flag = 0
         LEFT JOIN law_firm lf ON lf.id = lu2.firm_id AND lf.delete_flag = 0
@@ -112,7 +112,7 @@
                 ELSE 0
             END AS is_liked,
             orv.created_time
-        FROM order_review orv
+        FROM lawyer_order_review orv
         LEFT JOIN life_user lu ON lu.id = orv.user_id AND lu.delete_flag = 0
         LEFT JOIN lawyer_user lu2 ON lu2.id = orv.lawyer_user_id AND lu2.delete_flag = 0
         LEFT JOIN law_firm lf ON lf.id = lu2.firm_id AND lf.delete_flag = 0
@@ -157,7 +157,7 @@
                 ELSE 0
             END AS is_liked,
             orv.created_time
-        FROM order_review orv
+        FROM lawyer_order_review orv
         LEFT JOIN life_user lu ON lu.id = orv.user_id AND lu.delete_flag = 0
         LEFT JOIN lawyer_user lu2 ON lu2.id = orv.lawyer_user_id AND lu2.delete_flag = 0
         LEFT JOIN law_firm lf ON lf.id = lu2.firm_id AND lf.delete_flag = 0
@@ -199,7 +199,7 @@
         FROM lawyer_consultation_order lco
         LEFT JOIN lawyer_user lu ON lu.id = lco.lawyer_user_id AND lu.delete_flag = 0
         LEFT JOIN law_firm lf ON lf.id = lu.firm_id AND lf.delete_flag = 0
-        LEFT JOIN order_review orv ON orv.order_id = lco.id AND orv.delete_flag = 0
+        LEFT JOIN lawyer_order_review orv ON orv.order_id = lco.id AND orv.delete_flag = 0
         WHERE lco.delete_flag = 0
         AND lco.order_status = 3
         AND lco.client_user_id = #{userId}

alien-entity/src/main/resources/mapper/ReviewCommentMapper.xml

@@ -6,12 +6,15 @@
     <resultMap id="ReviewCommentVoResultMap" type="shop.alien.entity.store.vo.ReviewCommentVo">
         <id column="id" property="id" />
         <result column="review_id" property="reviewId" />
-        <result column="user_id" property="userId" />
+        <result column="send_user_id" property="sendUserId" />
+        <result column="receive_user_id" property="receiveUserId" />
         <result column="user_name" property="userName" />
         <result column="user_avatar" property="userAvatar" />
         <result column="comment_content" property="commentContent" />
         <result column="like_count" property="likeCount" />
         <result column="reply_count" property="replyCount" />
+        <result column="head_type" property="headType" />
+        <result column="head_id" property="headId" />
         <result column="is_liked" property="isLiked" />
         <result column="created_time" property="createdTime" />
     </resultMap>
@@ -21,19 +24,22 @@
         SELECT
             rc.id,
             rc.review_id,
-            rc.user_id,
+            rc.send_user_id,
+            rc.receive_user_id,
             lu.user_name AS user_name,
             lu.user_image AS user_avatar,
             rc.comment_content,
             rc.like_count,
             rc.reply_count,
+            rc.head_type,
+            rc.head_id,
             CASE 
                 WHEN #{currentUserId} IS NOT NULL AND llr.id IS NOT NULL THEN 1
                 ELSE 0
             END AS is_liked,
             rc.created_time
-        FROM review_comment rc
-        LEFT JOIN life_user lu ON lu.id = rc.user_id AND lu.delete_flag = 0
+        FROM lawyer_review_comment rc
+        LEFT JOIN life_user lu ON lu.id = rc.send_user_id AND lu.delete_flag = 0
         LEFT JOIN life_like_record llr ON CONVERT(llr.huifu_id, CHAR) = CONVERT(rc.id, CHAR)
             AND llr.type = '8' 
             AND CONVERT(llr.dianzan_id, CHAR) = CONVERT(#{currentUserId}, CHAR)
@@ -46,7 +52,7 @@
     <!-- 根据评价ID查询评论数量 -->
     <select id="getCommentCountByReviewId" resultType="java.lang.Integer">
         SELECT COUNT(*)
-        FROM review_comment
+        FROM lawyer_review_comment
         WHERE delete_flag = 0
         AND review_id = #{reviewId}
     </select>

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

@@ -78,10 +78,13 @@ public class ReviewCommentServiceImpl extends ServiceImpl<ReviewCommentMapper, R
         // 创建评论
         ReviewComment comment = new ReviewComment();
         comment.setReviewId(commentDto.getReviewId());
-        comment.setUserId(userId);
+        comment.setSendUserId(userId);
+        // 接收用户ID为评价的创建者
+        comment.setReceiveUserId(review.getUserId());
         comment.setCommentContent(commentDto.getCommentContent());
         comment.setLikeCount(0);
         comment.setReplyCount(0);
+        comment.setHeadType(0); // 0:是首评
         comment.setCreatedUserId(userId);
         comment.setCreatedTime(new Date());
 
@@ -132,7 +135,7 @@ public class ReviewCommentServiceImpl extends ServiceImpl<ReviewCommentMapper, R
         }
 
         // 验证是否为评论用户
-        if (!comment.getUserId().equals(userId)) {
+        if (!comment.getSendUserId().equals(userId)) {
             return R.fail("只能删除自己的评论");
         }