|
@@ -15,12 +15,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
import org.springframework.util.CollectionUtils;
|
|
|
import shop.alien.entity.result.R;
|
|
import shop.alien.entity.result.R;
|
|
|
-import shop.alien.entity.store.LawyerConsultationOrder;
|
|
|
|
|
-import shop.alien.entity.store.LawyerUser;
|
|
|
|
|
-import shop.alien.entity.store.LifeLikeRecord;
|
|
|
|
|
-import shop.alien.entity.store.LifeNotice;
|
|
|
|
|
-import shop.alien.entity.store.OrderReview;
|
|
|
|
|
-import shop.alien.entity.store.ReviewComment;
|
|
|
|
|
|
|
+import shop.alien.entity.store.*;
|
|
|
import shop.alien.entity.store.dto.OrderReviewDto;
|
|
import shop.alien.entity.store.dto.OrderReviewDto;
|
|
|
import shop.alien.entity.store.vo.LawyerReviewStatisticsVo;
|
|
import shop.alien.entity.store.vo.LawyerReviewStatisticsVo;
|
|
|
import shop.alien.entity.store.vo.OrderReviewDetailVo;
|
|
import shop.alien.entity.store.vo.OrderReviewDetailVo;
|
|
@@ -30,12 +25,7 @@ import shop.alien.entity.store.vo.WebSocketVo;
|
|
|
import shop.alien.lawyer.config.WebSocketProcess;
|
|
import shop.alien.lawyer.config.WebSocketProcess;
|
|
|
import shop.alien.lawyer.service.OrderReviewService;
|
|
import shop.alien.lawyer.service.OrderReviewService;
|
|
|
import shop.alien.lawyer.service.ReviewCommentService;
|
|
import shop.alien.lawyer.service.ReviewCommentService;
|
|
|
-import shop.alien.mapper.LawyerConsultationOrderMapper;
|
|
|
|
|
-import shop.alien.mapper.LawyerUserMapper;
|
|
|
|
|
-import shop.alien.mapper.LifeLikeRecordMapper;
|
|
|
|
|
-import shop.alien.mapper.LifeNoticeMapper;
|
|
|
|
|
-import shop.alien.mapper.OrderReviewMapper;
|
|
|
|
|
-import shop.alien.mapper.ReviewCommentMapper;
|
|
|
|
|
|
|
+import shop.alien.mapper.*;
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
@@ -61,6 +51,7 @@ public class OrderReviewServiceImpl extends ServiceImpl<OrderReviewMapper, Order
|
|
|
private final LawyerUserMapper lawyerUserMapper;
|
|
private final LawyerUserMapper lawyerUserMapper;
|
|
|
private final LifeNoticeMapper lifeNoticeMapper;
|
|
private final LifeNoticeMapper lifeNoticeMapper;
|
|
|
private final WebSocketProcess webSocketProcess;
|
|
private final WebSocketProcess webSocketProcess;
|
|
|
|
|
+ private final LifeUserMapper lifeUserMapper;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 系统发送者ID常量
|
|
* 系统发送者ID常量
|
|
@@ -319,6 +310,10 @@ public class OrderReviewServiceImpl extends ServiceImpl<OrderReviewMapper, Order
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 构建返回结果
|
|
// 构建返回结果
|
|
|
|
|
+ if(reviewVo.getUserId() != null){
|
|
|
|
|
+ LifeUser lifeUser = lifeUserMapper.selectOne(new LambdaQueryWrapper<LifeUser>().eq(LifeUser :: getId, reviewVo.getUserId()));
|
|
|
|
|
+ reviewVo.setUserPhone(lifeUser.getUserPhone());
|
|
|
|
|
+ }
|
|
|
OrderReviewDetailVo detailVo = new OrderReviewDetailVo();
|
|
OrderReviewDetailVo detailVo = new OrderReviewDetailVo();
|
|
|
detailVo.setReview(reviewVo);
|
|
detailVo.setReview(reviewVo);
|
|
|
detailVo.setComments(comments != null ? comments : new ArrayList<>());
|
|
detailVo.setComments(comments != null ? comments : new ArrayList<>());
|