push

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiAppointmentController.java

@@ -6,6 +6,7 @@ import com.yd.csf.api.service.ApiAppointmentService;
 import com.yd.csf.feign.client.appointment.ApiAppointmentFeignClient;
 import com.yd.csf.feign.client.appointment.ApiAppointmentFeignClient;
 import com.yd.csf.feign.dto.appointment.ApiAppointmentInfoDto;
 import com.yd.csf.feign.dto.appointment.ApiAppointmentInfoDto;
 import com.yd.csf.feign.request.appointment.*;
 import com.yd.csf.feign.request.appointment.*;
+import com.yd.csf.feign.response.appointment.ApiAppointmentAddResponse;
 import com.yd.csf.feign.response.appointment.ApiAppointmentDetailResponse;
 import com.yd.csf.feign.response.appointment.ApiAppointmentDetailResponse;
 import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse;
 import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,7 +64,7 @@ public class ApiAppointmentController implements ApiAppointmentFeignClient {
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result<String> add(ApiAppointmentAddRequest request) {
+    public Result<ApiAppointmentAddResponse> add(ApiAppointmentAddRequest request) {
         return apiAppointmentService.add(request);
         return apiAppointmentService.add(request);
     }
     }
 
 

yd-csf-api/src/main/java/com/yd/csf/api/service/ApiAppointmentService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
 import com.yd.csf.feign.dto.appointment.ApiAppointmentInfoDto;
 import com.yd.csf.feign.dto.appointment.ApiAppointmentInfoDto;
 import com.yd.csf.feign.request.appointment.*;
 import com.yd.csf.feign.request.appointment.*;
+import com.yd.csf.feign.response.appointment.ApiAppointmentAddResponse;
 import com.yd.csf.feign.response.appointment.ApiAppointmentDetailResponse;
 import com.yd.csf.feign.response.appointment.ApiAppointmentDetailResponse;
 import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse;
 import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse;
 import com.yd.csf.service.model.Appointment;
 import com.yd.csf.service.model.Appointment;
@@ -15,7 +16,7 @@ public interface ApiAppointmentService {
 
 
     Result<ApiAppointmentInfoDto> mainDetail(String appointmentBizId);
     Result<ApiAppointmentInfoDto> mainDetail(String appointmentBizId);
 
 
-    Result<String> add(ApiAppointmentAddRequest request);
+    Result<ApiAppointmentAddResponse> add(ApiAppointmentAddRequest request);
 
 
     Result addStorage(ApiAppointmentAddStorageRequest request);
     Result addStorage(ApiAppointmentAddStorageRequest request);
 
 

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

@@ -14,6 +14,7 @@ import com.yd.csf.api.service.*;
 import com.yd.csf.feign.dto.appointment.*;
 import com.yd.csf.feign.dto.appointment.*;
 import com.yd.csf.feign.dto.appointmentfile.ApiAppointmentFileDto;
 import com.yd.csf.feign.dto.appointmentfile.ApiAppointmentFileDto;
 import com.yd.csf.feign.request.appointment.*;
 import com.yd.csf.feign.request.appointment.*;
+import com.yd.csf.feign.response.appointment.ApiAppointmentAddResponse;
 import com.yd.csf.feign.response.appointment.ApiAppointmentDetailResponse;
 import com.yd.csf.feign.response.appointment.ApiAppointmentDetailResponse;
 import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse;
 import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse;
 import com.yd.csf.service.enums.AppointmentStatusEnum;
 import com.yd.csf.service.enums.AppointmentStatusEnum;
@@ -133,7 +134,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
      */
      */
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public Result<String> add(ApiAppointmentAddRequest request) {
+    public Result<ApiAppointmentAddResponse> add(ApiAppointmentAddRequest request) {
         //新增预约入参字段校验（非库校验）
         //新增预约入参字段校验（非库校验）
         apiAppointmentCheckService.checkAddRequest(request);
         apiAppointmentCheckService.checkAddRequest(request);
 
 
@@ -161,7 +162,9 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
 
 
         //预约编号和预约业务id更新到FNA表（提交待预约状态，预约信息的预约业务id和预约编号更新到Fna表的预约业务id和预约编号）
         //预约编号和预约业务id更新到FNA表（提交待预约状态，预约信息的预约业务id和预约编号更新到Fna表的预约业务id和预约编号）
         updateFnaBizIdAndNo(appointment.getFnaBizId(),appointment.getAppointmentBizId(),appointment.getAppointmentNo());
         updateFnaBizIdAndNo(appointment.getFnaBizId(),appointment.getAppointmentBizId(),appointment.getAppointmentNo());
-        return Result.success(appointment.getAppointmentBizId());
+        ApiAppointmentAddResponse response = new ApiAppointmentAddResponse();
+        response.setAppointmentBizId(appointment.getAppointmentBizId());
+        return Result.success(response);
     }
     }
 
 
     /**
     /**

yd-csf-feign/src/main/java/com/yd/csf/feign/client/appointment/ApiAppointmentFeignClient.java

@@ -5,6 +5,7 @@ import com.yd.csf.feign.dto.appointment.ApiAppointmentInfoDto;
 import com.yd.csf.feign.dto.appointment.ApiProductPlanAdditionalInfoDto;
 import com.yd.csf.feign.dto.appointment.ApiProductPlanAdditionalInfoDto;
 import com.yd.csf.feign.fallback.appointment.ApiAppointmentFeignFallbackFactory;
 import com.yd.csf.feign.fallback.appointment.ApiAppointmentFeignFallbackFactory;
 import com.yd.csf.feign.request.appointment.*;
 import com.yd.csf.feign.request.appointment.*;
+import com.yd.csf.feign.response.appointment.ApiAppointmentAddResponse;
 import com.yd.csf.feign.response.appointment.ApiAppointmentDetailResponse;
 import com.yd.csf.feign.response.appointment.ApiAppointmentDetailResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
@@ -48,7 +49,7 @@ public interface ApiAppointmentFeignClient {
      * @return
      * @return
      */
      */
     @PostMapping("/add")
     @PostMapping("/add")
-    Result<String> add(@Validated @RequestBody ApiAppointmentAddRequest request);
+    Result<ApiAppointmentAddResponse> add(@Validated @RequestBody ApiAppointmentAddRequest request);
 
 
     /**
     /**
      * 新增预约暂存 (聚合信息新增预约暂存)
      * 新增预约暂存 (聚合信息新增预约暂存)

yd-csf-feign/src/main/java/com/yd/csf/feign/fallback/appointment/ApiAppointmentFeignFallbackFactory.java

@@ -4,6 +4,7 @@ import com.yd.common.result.Result;
 import com.yd.csf.feign.client.appointment.ApiAppointmentFeignClient;
 import com.yd.csf.feign.client.appointment.ApiAppointmentFeignClient;
 import com.yd.csf.feign.dto.appointment.ApiAppointmentInfoDto;
 import com.yd.csf.feign.dto.appointment.ApiAppointmentInfoDto;
 import com.yd.csf.feign.request.appointment.*;
 import com.yd.csf.feign.request.appointment.*;
+import com.yd.csf.feign.response.appointment.ApiAppointmentAddResponse;
 import com.yd.csf.feign.response.appointment.ApiAppointmentDetailResponse;
 import com.yd.csf.feign.response.appointment.ApiAppointmentDetailResponse;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -36,7 +37,7 @@ public class ApiAppointmentFeignFallbackFactory implements FallbackFactory<ApiAp
             }
             }
 
 
             @Override
             @Override
-            public Result<String> add(ApiAppointmentAddRequest request) {
+            public Result<ApiAppointmentAddResponse> add(ApiAppointmentAddRequest request) {
                 return null;
                 return null;
             }
             }
 
 

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

+package com.yd.csf.feign.response.appointment;
+
+import lombok.Data;
+
+@Data
+public class ApiAppointmentAddResponse {
+
+    /**
+     * 预约信息主表唯一业务ID
+     */
+    private String appointmentBizId;
+}