Commit eee772fa by zhangxingmin

修复

parent b67352c7
......@@ -23,17 +23,17 @@ import com.yd.csf.service.dto.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.response.ApiGeneratePdfResponse;
import com.yd.oss.feign.response.ApiOssExcelParseResponse;
import com.yd.oss.service.service.PdfService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
......@@ -72,7 +72,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
private ISecondHolderService iSecondHolderService;
@Autowired
private PdfService pdfService;
private ApiPdfFeignClient apiPdfFeignClient;
@Autowired
private ApiExcelFeignClient apiExcelFeignClient;
......@@ -169,29 +169,15 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
String url = "";
//获取行程单的数据
ItineraryDto itineraryDto = iAppointmentService.getItineraryDto(appointmentBizId);
// ItineraryDto itineraryDto = new ItineraryDto();
// itineraryDto.setArrivalTime("2025-09-10 15:30:20");
// itineraryDto.setBusinessRepresentMobile1("1366666666");
// itineraryDto.setBusinessRepresentMobile1Code("86");
// itineraryDto.setBusinessRepresentName1("王红");
// itineraryDto.setCurrency("CY");
// itineraryDto.setEachIssuePremium("2999.99");
// itineraryDto.setInsurantName("陈发");
// itineraryDto.setMeetingPoint("香港大厦");
// itineraryDto.setName("王飞");
// itineraryDto.setPaymentTerm("10");
// itineraryDto.setProductName("全保产品");
// itineraryDto.setSigningAddress("香港保险公司");
// itineraryDto.setTotal("29990.99");
// itineraryDto.setNp("王");
// itineraryDto.setPolicyFee("999.89");
try {
url = pdfService.generatePDF(itineraryDto,appointmentBizId, TemplateTypeEnum.XCD.getItemValue());
return Result.success(url);
} catch (IOException e) {
e.printStackTrace();
throw new BusinessException("生成行程单PDF异常");
ApiGeneratePdfRequest request = new ApiGeneratePdfRequest();
request.setDataObject(itineraryDto);
request.setObjectId(appointmentBizId);
request.setTemplateType(TemplateTypeEnum.XCD.getItemValue());
Result<ApiGeneratePdfResponse> result = apiPdfFeignClient.generatePDF(request);
if (!Objects.isNull(result.getData())) {
url = result.getData().getUrl();
}
return Result.success(url);
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment