Переглянути джерело

配合前端修改商家端评论以及增加返回支付渠道

ldz 6 днів тому
батько
коміт
d6cba92690

+ 2 - 1
alien-entity/src/main/java/shop/alien/mapper/LawyerConsultationOrderMapper.java

@@ -354,7 +354,8 @@ public interface LawyerConsultationOrderMapper extends BaseMapper<LawyerConsulta
             "        luv.processing_time,\n" +
             "        lur.user_image,\n" +
             "        cas.status as commentStatus,\n" +
-            "        luv.report_result\n" +
+            "        luv.report_result ,\n" +
+            "        lco.pay_type\n" +
             "        FROM lawyer_consultation_order lco\n" +
             "        LEFT JOIN lawyer_user lu ON lco.lawyer_user_id = lu.id AND lu.delete_flag = 0\n" +
             "        LEFT JOIN law_firm lf on lf.id = lu.firm_id\n" +

+ 22 - 0
alien-lawyer/src/main/java/shop/alien/lawyer/controller/OrderReviewController.java

@@ -1,5 +1,6 @@
 package shop.alien.lawyer.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
@@ -59,6 +60,27 @@ public class OrderReviewController {
         return orderReviewService.getReviewDetail(reviewId, currentUserId);
     }
 
+    @ApiOperation("获取评价")
+    @ApiOperationSupport(order = 4)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderId", value = "订单ID", dataType = "int", paramType = "query", required = true),
+            @ApiImplicitParam(name = "currentUserId", value = "用户ID只能删除自己的评价)", dataType = "int", paramType = "query")
+    })
+    @GetMapping("/select/reviewIdByOrderId")
+    public R<OrderReviewDetailVo> reviewIdByOrderId(
+            @RequestParam Integer orderId,
+            @RequestParam(required = false) Integer currentUserId) {
+        log.info("OrderReviewController.getReviewDetail?reviewId={}, currentUserId={}", orderId, currentUserId);
+        QueryWrapper<OrderReview> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("order_id", orderId);
+        queryWrapper.eq("delete_flag", 0);
+        OrderReview review = orderReviewService.getOne(queryWrapper);
+        if (review == null) {
+            return R.fail("评价ID不能为空");
+        }
+        return orderReviewService.getReviewDetail(review.getId(), currentUserId);
+    }
+
     @ApiOperation("点赞评价")
     @ApiOperationSupport(order = 8)
     @ApiImplicitParams({