列表展示接单人和发单人信息

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/ServiceOrderFormDTO.java

@@ -72,4 +72,10 @@ public class ServiceOrderFormDTO {
 
     @ApiModelProperty(value = "子订单详情")
     private List<ServiceOrderFormDTO> childrenRequire;
+
+    @ApiModelProperty(value = "发布者基本信息")
+    private UserBaseInfoDTO orderRelease;
+
+    @ApiModelProperty(value = "接单人基本信息")
+    private UserBaseInfoDTO orderReceive;
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/BackRequirementsServiceImpl.java

@@ -73,7 +73,39 @@ public class BackRequirementsServiceImpl implements BackRequirementsService {
                 .map(serviceOrderFormDTO -> {
                     Integer id = serviceOrderFormDTO.getId();
                     List<ServiceOrderFormDO> listSon = backRequirementsDao.getSonFromFatherRequireId(id);
-                    List<ServiceOrderFormDTO> childrenList = listSon.stream().map(ServiceOrderFormDO::buildServiceOrderForm).collect(Collectors.toList());
+                    //如果没有子订单 那就为总订单添加发单人和接单人信息
+                    if(listSon == null || listSon.isEmpty()) {
+                        //获取发单人信息
+                        Integer userIdByRequireId = requirementsDao.getUserIdByRequireId(id);
+                        UserBaseInfoDTO userBaseInfoDTO = userAppApi.feignGetUserBaseInfo(userIdByRequireId);
+                        serviceOrderFormDTO.setOrderRelease(userBaseInfoDTO);
+                        //获取接单人信息
+                        Integer pilotUserIdByRequireId = requirementsDao.getPilotUserIdByRequireId(id);
+                        if (pilotUserIdByRequireId == null) {
+                            serviceOrderFormDTO.setOrderReceive(null);
+                        }else {
+                            UserBaseInfoDTO pilotUserBaseInfoDTO = userAppApi.feignGetUserBaseInfo(pilotUserIdByRequireId);
+                            serviceOrderFormDTO.setOrderReceive(pilotUserBaseInfoDTO);
+                        }
+                        return serviceOrderFormDTO;
+                    }
+                    List<ServiceOrderFormDTO> childrenList = listSon.stream().map(ServiceOrderFormDO::buildServiceOrderForm).
+                            map(serviceOrderFormDTO1 -> {
+                                //获取发单人信息
+                                Integer userIdByRequireId = requirementsDao.getUserIdByRequireId(serviceOrderFormDTO1.getId());
+                                UserBaseInfoDTO userBaseInfoDTO = userAppApi.feignGetUserBaseInfo(userIdByRequireId);
+                                serviceOrderFormDTO1.setOrderRelease(userBaseInfoDTO);
+                                //获取接单人信息
+                                Integer pilotUserIdByRequireId = requirementsDao.getPilotUserIdByRequireId(serviceOrderFormDTO1.getId());
+                                if (pilotUserIdByRequireId == null) {
+                                    serviceOrderFormDTO1.setOrderReceive(null);
+                                }else {
+                                    UserBaseInfoDTO pilotUserBaseInfoDTO = userAppApi.feignGetUserBaseInfo(pilotUserIdByRequireId);
+                                    serviceOrderFormDTO1.setOrderReceive(pilotUserBaseInfoDTO);
+                                }
+                                return serviceOrderFormDTO1;
+                            }).
+                            collect(Collectors.toList());
                     serviceOrderFormDTO.setChildrenRequire(childrenList);
                     return serviceOrderFormDTO;
                 })