|
@@ -20,6 +20,7 @@ import shop.alien.entity.store.LawyerUser;
|
|
|
import shop.alien.entity.store.dto.LawyerConsultationOrderDto;
|
|
import shop.alien.entity.store.dto.LawyerConsultationOrderDto;
|
|
|
import shop.alien.entity.store.vo.LawyerConsultationOrderVO;
|
|
import shop.alien.entity.store.vo.LawyerConsultationOrderVO;
|
|
|
import shop.alien.mapper.LawyerConsultationOrderMapper;
|
|
import shop.alien.mapper.LawyerConsultationOrderMapper;
|
|
|
|
|
+import shop.alien.mapper.LawyerExpertiseAreaMapper;
|
|
|
import shop.alien.mapper.LawyerServiceAreaMapper;
|
|
import shop.alien.mapper.LawyerServiceAreaMapper;
|
|
|
import shop.alien.mapper.LawyerUserMapper;
|
|
import shop.alien.mapper.LawyerUserMapper;
|
|
|
import shop.alien.store.service.LawyerConsultationOrderService;
|
|
import shop.alien.store.service.LawyerConsultationOrderService;
|
|
@@ -48,6 +49,7 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
|
|
|
private final LawyerUserService lawyerUserService;
|
|
private final LawyerUserService lawyerUserService;
|
|
|
private final LawyerServiceAreaMapper lawyerServiceAreaMapper;
|
|
private final LawyerServiceAreaMapper lawyerServiceAreaMapper;
|
|
|
private final LawyerUserMapper lawyerUserMapper;
|
|
private final LawyerUserMapper lawyerUserMapper;
|
|
|
|
|
+ private final LawyerExpertiseAreaMapper lawyerExpertiseAreaMapper;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public R<IPage<LawyerConsultationOrderVO>> getConsultationOrderList(int pageNum, int pageSize, String orderNumber,
|
|
public R<IPage<LawyerConsultationOrderVO>> getConsultationOrderList(int pageNum, int pageSize, String orderNumber,
|
|
@@ -510,8 +512,10 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
|
|
|
if (lawyerUser != null) {
|
|
if (lawyerUser != null) {
|
|
|
fillLawyerInfo(orderVO, lawyerUser);
|
|
fillLawyerInfo(orderVO, lawyerUser);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
|
|
|
- // 查询律师服务领域
|
|
|
|
|
|
|
+ // 查询律师问题场景
|
|
|
List<Integer> lawyerIdList = Collections.singletonList(lawyerUserId);
|
|
List<Integer> lawyerIdList = Collections.singletonList(lawyerUserId);
|
|
|
Map<String, List<String>> serviceAreaMap = getLawyerServiceArea(lawyerIdList);
|
|
Map<String, List<String>> serviceAreaMap = getLawyerServiceArea(lawyerIdList);
|
|
|
String lawyerUserIdStr = String.valueOf(lawyerUserId);
|
|
String lawyerUserIdStr = String.valueOf(lawyerUserId);
|