获取行程单详情

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
 import com.yd.csf.api.service.ApiAppointmentFileService;
 import com.yd.csf.feign.client.appointmentfile.ApiAppointmentFileFeignClient;
+import com.yd.csf.feign.dto.appointmentfile.ItineraryDto;
 import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileAddRequest;
 import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileEditRequest;
 import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFilePageRequest;
@@ -96,6 +97,16 @@ public class ApiAppointmentFileController implements ApiAppointmentFileFeignClie
     }
 
     /**
+     * 获取行程单详情
+     * @param appointmentBizId
+     * @return
+     */
+    @Override
+    public Result<ItineraryDto> itineraryDetail(String appointmentBizId) {
+        return apiAppointmentFileService.itineraryDetail(appointmentBizId);
+    }
+
+    /**
      * Excel导出-预约信息
      * @param appointmentBizId
      * @return

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

@@ -3,6 +3,7 @@ package com.yd.csf.api.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
 import com.yd.csf.feign.dto.appointmentfile.ApiAppointmentFileDto;
+import com.yd.csf.feign.dto.appointmentfile.ItineraryDto;
 import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileAddRequest;
 import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileEditRequest;
 import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFilePageRequest;
@@ -30,6 +31,8 @@ public interface ApiAppointmentFileService {
 
     Result<String> itineraryPdf(String appointmentBizId);
 
+    Result<ItineraryDto> itineraryDetail(String appointmentBizId);
+
     Result<ApiAppointmentExportExcelResponse> appointmentExportExcel(String appointmentBizId);
 
     Result<ApiAppointmentImportExcelResponse> appointmentImportExcel(MultipartFile file,

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

@@ -26,14 +26,13 @@ import com.yd.csf.feign.response.appointmentfile.ApiAppointmentFilePageResponse;
 import com.yd.csf.feign.response.appointmentfile.ApiAppointmentImportExcelResponse;
 import com.yd.csf.service.dto.AdditionalDto;
 import com.yd.csf.service.dto.BeneficiaryDto;
-import com.yd.csf.service.dto.ItineraryDto;
+import com.yd.csf.feign.dto.appointmentfile.ItineraryDto;
 import com.yd.csf.service.model.*;
 import com.yd.csf.service.service.*;
 import com.yd.oss.feign.client.ApiExcelFeignClient;
 import com.yd.oss.feign.client.ApiPdfFeignClient;
 import com.yd.oss.feign.enums.TemplateTypeEnum;
 import com.yd.oss.feign.request.ApiGeneratePdfRequest;
-import com.yd.oss.feign.request.ApiOssExcelParseRequest;
 import com.yd.oss.feign.request.ApiOssExportAppointmentExcelRequest;
 import com.yd.oss.feign.response.ApiGeneratePdfResponse;
 import com.yd.oss.feign.response.ApiOssExcelParseResponse;
@@ -198,6 +197,18 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
     }
 
     /**
+     * 获取行程单详情
+     * @param appointmentBizId
+     * @return
+     */
+    @Override
+    public Result<ItineraryDto> itineraryDetail(String appointmentBizId) {
+        //获取行程单的数据
+        ItineraryDto itineraryDto = iAppointmentService.getItineraryDto(appointmentBizId);
+        return Result.success(itineraryDto);
+    }
+
+    /**
      * Excel导出-预约信息
      * @param appointmentBizId
      * @return

yd-csf-feign/src/main/java/com/yd/csf/feign/client/appointmentfile/ApiAppointmentFileFeignClient.java

 package com.yd.csf.feign.client.appointmentfile;
 
 import com.yd.common.result.Result;
+import com.yd.csf.feign.dto.appointmentfile.ItineraryDto;
 import com.yd.csf.feign.request.appointmentfile.ApiAppointmentImportExcelRequest;
 import com.yd.csf.feign.fallback.appointmentfile.ApiAppointmentFileFeignFallbackFactory;
 import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileAddRequest;
@@ -70,6 +71,14 @@ public interface ApiAppointmentFileFeignClient {
     Result<String> itineraryPdf(@NotBlank(message = "预约信息主表唯一业务ID不能为空") @RequestParam(value = "appointmentBizId") String appointmentBizId);
 
     /**
+     * 获取行程单详情
+     * @param appointmentBizId
+     * @return
+     */
+    @GetMapping("/pdf/itinerary/detail")
+    Result<ItineraryDto> itineraryDetail(@NotBlank(message = "预约信息主表唯一业务ID不能为空") @RequestParam(value = "appointmentBizId") String appointmentBizId);
+
+    /**
      * Excel导出-预约信息
      * @param appointmentBizId
      * @return

yd-csf-service/src/main/java/com/yd/csf/service/dto/ItineraryDto.java → yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointmentfile/ItineraryDto.java

-package com.yd.csf.service.dto;
+package com.yd.csf.feign.dto.appointmentfile;
 
 import com.yd.oss.feign.annotation.PdfField;
 import lombok.Data;
@@ -88,7 +88,7 @@ public class ItineraryDto {
     private String productName;
 
     /**
-     * 合计金额（供款年期*每期保费）
+     * 合计金额（产品计划首期保费+保单证费）
      */
     @PdfField("total")
     private String total;
@@ -98,4 +98,10 @@ public class ItineraryDto {
      */
     @PdfField("np")
     private String np;
+
+    /**
+     * 备注
+     */
+    @PdfField("remark")
+    private String remark;
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/fallback/appointmentfile/ApiAppointmentFileFeignFallbackFactory.java

@@ -2,6 +2,7 @@ package com.yd.csf.feign.fallback.appointmentfile;
 
 import com.yd.common.result.Result;
 import com.yd.csf.feign.client.appointmentfile.ApiAppointmentFileFeignClient;
+import com.yd.csf.feign.dto.appointmentfile.ItineraryDto;
 import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileAddRequest;
 import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileEditRequest;
 import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFilePageRequest;
@@ -55,6 +56,11 @@ public class ApiAppointmentFileFeignFallbackFactory implements FallbackFactory<A
             }
 
             @Override
+            public Result<ItineraryDto> itineraryDetail(String appointmentBizId) {
+                return null;
+            }
+
+            @Override
             public Result<ApiAppointmentExportExcelResponse> appointmentExportExcel(String appointmentBizId) {
                 return null;
             }

yd-csf-service/src/main/java/com/yd/csf/service/dao/AppointmentMapper.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.csf.feign.request.appointment.ApiAppointmentPageRequest;
 import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse;
-import com.yd.csf.service.dto.ItineraryDto;
+import com.yd.csf.feign.dto.appointmentfile.ItineraryDto;
 import com.yd.csf.service.model.Appointment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;

yd-csf-service/src/main/java/com/yd/csf/service/service/IAppointmentService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.csf.feign.request.appointment.ApiAppointmentPageRequest;
 import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse;
-import com.yd.csf.service.dto.ItineraryDto;
+import com.yd.csf.feign.dto.appointmentfile.ItineraryDto;
 import com.yd.csf.service.model.Appointment;
 import com.baomidou.mybatisplus.extension.service.IService;
 

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/AppointmentServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.csf.feign.request.appointment.ApiAppointmentPageRequest;
 import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse;
-import com.yd.csf.service.dto.ItineraryDto;
+import com.yd.csf.feign.dto.appointmentfile.ItineraryDto;
 import com.yd.csf.service.model.Appointment;
 import com.yd.csf.service.dao.AppointmentMapper;
 import com.yd.csf.service.service.IAppointmentService;

yd-csf-service/src/main/resources/mappers/AppointmentMapper.xml

@@ -60,7 +60,7 @@
         order by a.create_time desc
     </select>
 
-    <select id="getItineraryDto" resultType="com.yd.csf.service.dto.ItineraryDto">
+    <select id="getItineraryDto" resultType="com.yd.csf.feign.dto.appointmentfile.ItineraryDto">
         select
         a.arrival_time,a.meeting_point,
         a.signing_address,a.business_represent_name1,