|
|
@@ -23,8 +23,10 @@ import com.jzg.quotation.taikang.crawler.model.entity.TKAreaInfoVo;
|
|
|
import com.jzg.quotation.taikang.crawler.model.entity.TKCarAccident;
|
|
|
import com.jzg.quotation.taikang.crawler.model.entity.TKInsureInfo;
|
|
|
import com.jzg.quotation.taikang.crawler.model.entity.TKOrderData;
|
|
|
+import com.jzg.quotation.taikang.crawler.model.entity.po.TKCrawlerOrder;
|
|
|
import com.jzg.quotation.taikang.crawler.repository.TKLoginSessionRepository;
|
|
|
import com.jzg.quotation.taikang.crawler.repository.TKPreciseInitResultRepository;
|
|
|
+import com.jzg.quotation.taikang.crawler.service.TKCrawlerOrderService;
|
|
|
import com.jzg.quotation.taikang.crawler.service.TKHttpAPIService;
|
|
|
import com.jzg.quotation.taikang.crawler.service.TKQuotationBaseService;
|
|
|
import com.jzg.quotation.taikang.crawler.service.TKSimpleService;
|
|
|
@@ -67,6 +69,10 @@ public class TKQuotationBaseServiceImpl implements TKQuotationBaseService {
|
|
|
@Resource
|
|
|
private RedisCacheUtil redisCacheUtil;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private TKCrawlerOrderService tkCrawlerOrderService;
|
|
|
+
|
|
|
+
|
|
|
private TKLoginSession loginSession(String username, String password) {
|
|
|
// 缓存获取
|
|
|
TKLoginSession session = redisCacheUtil.getSessionCache(username);
|
|
|
@@ -242,19 +248,15 @@ public class TKQuotationBaseServiceImpl implements TKQuotationBaseService {
|
|
|
underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.PAY_PENDING);
|
|
|
// 保司订单号
|
|
|
underwritingResultsVo.setCompanyOrderNo(proposalNo);
|
|
|
- // 支付连接
|
|
|
-// underwritingResultsVo.setPaymentLink();
|
|
|
|
|
|
+ // tkCrawlerOrderService.save(underwritingVo, underwritingResultsVo, preciseInitResult.getMainOrderId(), true);
|
|
|
} else {
|
|
|
underwritingResultsVo.setUnderwritingResult("核保失败");
|
|
|
underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.AUDIT_FAIL);
|
|
|
+ // tkCrawlerOrderService.save(underwritingVo, underwritingResultsVo, preciseInitResult.getMainOrderId(), false);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
return underwritingResultsVo;
|
|
|
-
|
|
|
- // 支付的二维码数据示例:https://car.tk.cn/ep/#/insureProcess/payUnion?orderID=WBPC202503121144127720000&proposalNo=00671071370142500000004363&turnFlag=0&isRetrans=1&userid=&fromId=67107&tkSignature=TKSIGNATURE&tplatformId=feda77e829d4dedbbd8b4e236bacfac5&isTPLATFlag=1&clientId=feda77e829d4dedbbd8b4e236bacfac5
|
|
|
- // 包含的主要参数:orderID、proposalNo、fromId、tplatformId、clientId
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -275,8 +277,8 @@ public class TKQuotationBaseServiceImpl implements TKQuotationBaseService {
|
|
|
CarCheckUploadFileParam param = new CarCheckUploadFileParam();
|
|
|
// 泰康订单
|
|
|
String orderID = redisCacheUtil.getCache(insuranceUploadImageVo.getOrder().getOrdersNo(), "DD");
|
|
|
- // 泰康保单号
|
|
|
- String proposalNo = redisCacheUtil.getCache(insuranceUploadImageVo.getOrder().getOrdersNo(), "HB");
|
|
|
+ // 泰康保单号, 现在获取不到,核保成功之后才会返回
|
|
|
+ // String proposalNo = redisCacheUtil.getCache(insuranceUploadImageVo.getOrder().getOrdersNo(), "HB");
|
|
|
|
|
|
param.setChannelCode("OffWeb");
|
|
|
param.setTplatformId(session.getTplatformId());
|
|
|
@@ -481,19 +483,21 @@ public class TKQuotationBaseServiceImpl implements TKQuotationBaseService {
|
|
|
public DownloadPolicyResultVo downloadPolicy(DownloadPolicyVo orderBase) {
|
|
|
AttributionInformationVo attributionInformationVo = orderBase.getOrder().getAttributionInformationVo();
|
|
|
TKLoginSession session = loginSession(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
|
|
|
- String token = session.getToken();
|
|
|
- String tplatformId = session.getTplatformId();
|
|
|
// 泰康保单号
|
|
|
- String proposalNo = redisCacheUtil.getCache(orderBase.getOrder().getOrdersNo(), "HB");
|
|
|
+ TKCrawlerOrder tkCrawlerOrder = redisCacheUtil.getOrderResponse(orderBase.getOrder().getOrdersNo());
|
|
|
+ if (tkCrawlerOrder == null) {
|
|
|
+ tkCrawlerOrder = tkCrawlerOrderService.getByOrdersNo(orderBase.getOrder().getOrdersNo());
|
|
|
+ }
|
|
|
|
|
|
- OrderCompleteAgentResult.OrderCompleteAgentResultEntity orderCompleteAgentResultEntity = httpService.orderCompleteAgent(token, tplatformId, proposalNo);
|
|
|
+ OrderCompleteAgentResult.OrderCompleteAgentResultEntity orderCompleteAgentResultEntity = httpService.orderCompleteAgent(session, tkCrawlerOrder.getOrderNo());
|
|
|
|
|
|
if (orderCompleteAgentResultEntity == null) {
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
+ DownloadPolicyResultVo downloadPolicyResultVo = new DownloadPolicyResultVo();
|
|
|
// 投保单,base64
|
|
|
- String proposal = httpService.proposalDownload(proposalNo);
|
|
|
+ String proposal = httpService.proposalDownload(tkCrawlerOrder.getOrderNo());
|
|
|
|
|
|
// 商业险子保单号BI
|
|
|
String subPolicyNoBi = orderCompleteAgentResultEntity.getSubPolicyNoBi();
|
|
|
@@ -503,18 +507,19 @@ public class TKQuotationBaseServiceImpl implements TKQuotationBaseService {
|
|
|
String policy = httpService.imageDownloadPolicy(subPolicyNoBi);
|
|
|
// 获取发票下载地址 url
|
|
|
String pdf = httpService.imageGetInvoiceURL(subPolicyNoBi, "PDF");
|
|
|
+ downloadPolicyResultVo.setSyUrl(pdf);
|
|
|
}
|
|
|
|
|
|
// 交强险子保单号CI
|
|
|
String subPolicyNoCi = orderCompleteAgentResultEntity.getSubPolicyNoCi();
|
|
|
-
|
|
|
if (subPolicyNoCi != null) {
|
|
|
// 交强险子保单,base64格式
|
|
|
String policy = httpService.imageDownloadPolicy(subPolicyNoCi);
|
|
|
// 获取发票下载地址 url
|
|
|
String pdf = httpService.imageGetInvoiceURL(subPolicyNoCi, "PDF");
|
|
|
+ downloadPolicyResultVo.setJqUrl(pdf);
|
|
|
}
|
|
|
- return null;
|
|
|
+ return downloadPolicyResultVo;
|
|
|
}
|
|
|
|
|
|
@Override
|