push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentServiceImpl.java

@@ -90,8 +90,11 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
     public Result<ApiAppointmentDetailResponse> detail(String appointmentBizId) {
     public Result<ApiAppointmentDetailResponse> detail(String appointmentBizId) {
         ApiAppointmentDetailResponse response = new ApiAppointmentDetailResponse();
         ApiAppointmentDetailResponse response = new ApiAppointmentDetailResponse();
         //预约主体信息详情（单个对象详情）
         //预约主体信息详情（单个对象详情）
-        Result<ApiAppointmentInfoDto> result = mainDetail(appointmentBizId);
-        response.setApiAppointmentInfoDto(result.getData());
+        Result<Appointment> result = checkAppointmentIsExist(appointmentBizId);
+        Appointment appointment = result.getData();
+        ApiAppointmentInfoDto dto = new ApiAppointmentInfoDto();
+        BeanUtils.copyProperties(appointment,dto);
+        response.setApiAppointmentInfoDto(dto);
         //产品计划信息
         //产品计划信息
         Result<ApiProductPlanInfoDto> result1 = apiProductPlanService.detail(appointmentBizId,"");
         Result<ApiProductPlanInfoDto> result1 = apiProductPlanService.detail(appointmentBizId,"");
         response.setApiProductPlanInfoDto(result1.getData());
         response.setApiProductPlanInfoDto(result1.getData());
@@ -110,6 +113,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
         //预约附件信息列表
         //预约附件信息列表
         Result<List<ApiAppointmentFileDto>> result6 = apiAppointmentFileService.list(appointmentBizId);
         Result<List<ApiAppointmentFileDto>> result6 = apiAppointmentFileService.list(appointmentBizId);
         response.setApiAppointmentFileDtoList(result6.getData());
         response.setApiAppointmentFileDtoList(result6.getData());
+        response.setStatus(!Objects.isNull(result.getData()) ? appointment.getStatus() : null);
         return Result.success(response);
         return Result.success(response);
     }
     }
 
 

yd-csf-feign/src/main/java/com/yd/csf/feign/response/appointment/ApiAppointmentDetailResponse.java

@@ -10,6 +10,11 @@ import java.util.List;
 public class ApiAppointmentDetailResponse {
 public class ApiAppointmentDetailResponse {
 
 
     /**
     /**
+     * 预约状态: 0-暂存 1-待预约, 2-待签署 3-已签署 4-已取消（字典）
+     */
+    private Integer status;
+
+    /**
      * 预约简要信息
      * 预约简要信息
      */
      */
     private ApiAppointmentBriefInfoDto apiAppointmentBriefInfoDto;
     private ApiAppointmentBriefInfoDto apiAppointmentBriefInfoDto;