补充提交

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

@@ -183,7 +183,7 @@ public class LawyerUser extends Model<LawyerUser> {
     @TableField("id_card_back_image")
     private String idCardBackImage;
 
-    @ApiModelProperty(value = "服务评分, 0-100分")
+    @ApiModelProperty(value = "服务评分, 0-5分")
     @TableField("service_score")
     private Integer serviceScore;
 

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

@@ -173,7 +173,7 @@ public class LawyerUserVo implements Serializable {
     @TableField("id_card_back_image")
     private String idCardBackImage;
 
-    @ApiModelProperty(value = "服务评分, 0-100分")
+    @ApiModelProperty(value = "服务评分, 0-5分")
     @TableField("service_score")
     private Integer serviceScore;
 

alien-entity/src/main/java/shop/alien/mapper/OrderReviewMapper.java

@@ -64,5 +64,53 @@ public interface OrderReviewMapper extends BaseMapper<OrderReview> {
             IPage<PendingReviewVo> page,
             @Param("userId") Integer userId
     );
+
+    /**
+     * 计算律师的平均评分（overallRating的平均值）
+     *
+     * @param lawyerUserId 律师用户ID
+     * @return 平均评分（1-5星）
+     */
+    Double getAverageRatingByLawyerUserId(@Param("lawyerUserId") Integer lawyerUserId);
+
+    /**
+     * 统计律师的好评数（4.5-5分）
+     *
+     * @param lawyerUserId 律师用户ID
+     * @return 好评数
+     */
+    Integer getGoodReviewCountByLawyerUserId(@Param("lawyerUserId") Integer lawyerUserId);
+
+    /**
+     * 统计律师的中评数（3-4分）
+     *
+     * @param lawyerUserId 律师用户ID
+     * @return 中评数
+     */
+    Integer getMediumReviewCountByLawyerUserId(@Param("lawyerUserId") Integer lawyerUserId);
+
+    /**
+     * 统计律师的差评数（0-2.5分）
+     *
+     * @param lawyerUserId 律师用户ID
+     * @return 差评数
+     */
+    Integer getBadReviewCountByLawyerUserId(@Param("lawyerUserId") Integer lawyerUserId);
+
+    /**
+     * 根据律师ID和类型分页查询评价列表（包含用户和律师信息）
+     *
+     * @param page 分页对象
+     * @param lawyerUserId 律师用户ID
+     * @param type 查询分类（1：好评，2：中评，3：差评，4：有图，为空时返回全部）
+     * @param currentUserId 当前用户ID（用于判断是否已点赞，可为null）
+     * @return 分页结果
+     */
+    IPage<OrderReviewVo> getReviewListByLawyerAndType(
+            IPage<OrderReviewVo> page,
+            @Param("lawyerUserId") Integer lawyerUserId,
+            @Param("type") Integer type,
+            @Param("currentUserId") Integer currentUserId
+    );
 }
 

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

@@ -19,6 +19,7 @@
         <result column="response_time_rating" property="responseTimeRating" />
         <result column="professional_ability_rating" property="professionalAbilityRating" />
         <result column="review_content" property="reviewContent" />
+        <result column="review_images" property="reviewImagesJson" />
         <result column="is_anonymous" property="isAnonymous" />
         <result column="like_count" property="likeCount" />
         <result column="comment_count" property="commentCount" />
@@ -149,8 +150,15 @@
             orv.response_time_rating,
             orv.professional_ability_rating,
             orv.review_content,
+            orv.review_images,
             orv.is_anonymous,
-            orv.like_count,
+            COALESCE((
+                SELECT COUNT(1) 
+                FROM life_like_record llr_count 
+                WHERE CONVERT(llr_count.huifu_id, CHAR) = CONVERT(orv.id, CHAR)
+                    AND llr_count.type = '7'
+                    AND llr_count.delete_flag = 0
+            ), 0) AS like_count,
             orv.comment_count,
             CASE 
                 WHEN #{currentUserId} IS NOT NULL AND llr.id IS NOT NULL THEN 1
@@ -207,5 +215,123 @@
         ORDER BY lco.end_time DESC
     </select>
 
+    <!-- 统计律师的好评数（4.5-5分） -->
+    <select id="getGoodReviewCountByLawyerUserId" resultType="java.lang.Integer">
+        <![CDATA[
+        SELECT COUNT(*)
+        FROM lawyer_order_review
+        WHERE lawyer_user_id = #{lawyerUserId}
+        AND delete_flag = 0
+        AND overall_rating IS NOT NULL
+        AND overall_rating >= 4.5
+        AND overall_rating <= 5
+        ]]>
+    </select>
+
+    <!-- 统计律师的中评数（3-4分） -->
+    <select id="getMediumReviewCountByLawyerUserId" resultType="java.lang.Integer">
+        <![CDATA[
+        SELECT COUNT(*)
+        FROM lawyer_order_review
+        WHERE lawyer_user_id = #{lawyerUserId}
+        AND delete_flag = 0
+        AND overall_rating IS NOT NULL
+        AND overall_rating >= 3
+        AND overall_rating < 4.5
+        ]]>
+    </select>
+
+    <!-- 统计律师的差评数（0-2.5分，包含2.5） -->
+    <select id="getBadReviewCountByLawyerUserId" resultType="java.lang.Integer">
+        <![CDATA[
+        SELECT COUNT(*)
+        FROM lawyer_order_review
+        WHERE lawyer_user_id = #{lawyerUserId}
+        AND delete_flag = 0
+        AND overall_rating IS NOT NULL
+        AND overall_rating >= 0
+        AND overall_rating < 3
+        ]]>
+    </select>
+
+    <!-- 根据律师ID和类型分页查询评价列表（包含用户和律师信息） -->
+    <select id="getReviewListByLawyerAndType" resultMap="OrderReviewVoResultMap">
+        SELECT
+            orv.id,
+            orv.order_id,
+            orv.order_number,
+            orv.user_id,
+            CASE
+                WHEN orv.is_anonymous = 1 THEN '匿名用户'
+                ELSE lu.user_name
+            END AS user_name,
+            CASE
+                WHEN orv.is_anonymous = 1 THEN NULL
+                ELSE lu.user_image
+            END AS user_avatar,
+            orv.lawyer_user_id,
+            lu2.name AS lawyer_name,
+            lu2.head_img AS lawyer_avatar,
+            lf.firm_name AS law_firm_name,
+            orv.overall_rating,
+            orv.service_attitude_rating,
+            orv.response_time_rating,
+            orv.professional_ability_rating,
+            orv.review_content,
+            orv.is_anonymous,
+            COALESCE((
+                SELECT COUNT(1)
+                FROM life_like_record llr_count
+                WHERE CONVERT(llr_count.huifu_id, CHAR) = CONVERT(orv.id, CHAR)
+                    AND llr_count.type = '7'
+                    AND llr_count.delete_flag = 0
+            ), 0) AS like_count,
+            orv.comment_count,
+            orv.review_images,
+            CASE
+                WHEN #{currentUserId} IS NOT NULL AND llr.id IS NOT NULL THEN 1
+                ELSE 0
+            END AS is_liked,
+            orv.created_time
+        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
+        LEFT JOIN life_like_record llr ON CONVERT(llr.huifu_id, CHAR) = CONVERT(orv.id, CHAR)
+            AND llr.type = '7'
+            AND CONVERT(llr.dianzan_id, CHAR) = CONVERT(#{currentUserId}, CHAR)
+            AND llr.delete_flag = 0
+        WHERE orv.delete_flag = 0
+        AND orv.lawyer_user_id = #{lawyerUserId}
+        <if test="type != null">
+            <choose>
+                <when test="type == 1">
+                    <![CDATA[
+                    AND orv.overall_rating >= 4.5
+                    AND orv.overall_rating <= 5
+                    ]]>
+                </when>
+                <when test="type == 2">
+                    <![CDATA[
+                    AND orv.overall_rating >= 3
+                    AND orv.overall_rating < 4.5
+                    ]]>
+                </when>
+                <when test="type == 3">
+                    <![CDATA[
+                    AND orv.overall_rating >= 0
+                    AND orv.overall_rating < 3
+                    ]]>
+                </when>
+                <when test="type == 4">
+                    AND orv.review_images IS NOT NULL
+                    AND orv.review_images != ''
+                    AND TRIM(orv.review_images) != ''
+                </when>
+            </choose>
+        </if>
+        ORDER BY orv.created_time DESC
+    </select>
+
 </mapper>
 

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

@@ -41,6 +41,60 @@ 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({
@@ -151,38 +205,28 @@ public class OrderReviewController {
         return orderReviewService.getMyReviewList(page, size, userId, 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(
-            @RequestParam Integer reviewId,
-            @RequestParam Integer userId) {
-        log.info("OrderReviewController.likeReview?reviewId={}, userId={}", reviewId, userId);
-        if (userId == null) {
-            return R.fail("用户未登录");
-        }
-        return orderReviewService.likeReview(reviewId, userId);
-    }
-
-    @ApiOperation("取消点赞评价")
-    @ApiOperationSupport(order = 9)
+    @ApiOperation("根据律师ID和类型分页查询评价列表（不包含评论）")
+    @ApiOperationSupport(order = 11)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "reviewId", value = "评价ID", dataType = "int", paramType = "query", required = true),
-            @ApiImplicitParam(name = "userId", value = "用户ID", dataType = "int", paramType = "query", required = true)
+            @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")
     })
-    @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("用户未登录");
+    @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不能为空");
         }
-        return orderReviewService.cancelLikeReview(reviewId, userId);
+        return orderReviewService.getReviewListByLawyerAndType(page, size, lawyerUserId, type, currentUserId);
     }
 }