永诚驾意险修改

src/main/java/com/ydtech/modules/ins/model/dto/CarInsPolicyDto.java

@@ -1,5 +1,7 @@
 package com.ydtech.modules.ins.model.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -9,19 +11,20 @@ import lombok.Data;
  * @date: 2023年10月12日 0012
  */
 @Data
+@ApiModel("车险保单")
 public class CarInsPolicyDto {
 
-    /**
-     * 交强险标志地址
-     */
+
+    @ApiModelProperty("交强险标志地址")
     private String jqFlagUrl; //
-    /**
-     * 交强险保单地址
-     */
-    private String jqUrl; //交强险保单地址
-    /**
-     * 商业险保单地址
-     */
+
+    @ApiModelProperty("交强险保单地址")
+    private String jqUrl;
+
+    @ApiModelProperty("商业险保单地址")
     private String syUrl;
 
+    @ApiModelProperty("保单地址")
+    private String jyUrl;
+
 }

src/main/java/com/ydtech/modules/ins/model/yc/YcBuildData.java

@@ -3,7 +3,6 @@ package com.ydtech.modules.ins.model.yc;
 import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
-import com.ydtech.modules.ins.model.yc.ruote.response.ProposalResponse;
 import com.ydtech.modules.ins.model.yc.ruote.response.RuoteResponse;
 import com.ydtech.modules.ins.model.yc.ruote.response.TfiWarnListResponse;
 import com.ydtech.modules.order.entity.InsOrders;
@@ -11,12 +10,10 @@ import com.ydtech.modules.order.entity.TaxArrears;
 import com.ydtech.utils.StringUtils;
 import lombok.Data;
 import org.springframework.stereotype.Component;
-import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -211,14 +208,16 @@ public class YcBuildData {
         //交强保费 含税
         double jqPremium = 0;
         if (StringUtils.isNotEmpty(rd.getBase().getNBefTaxPrmJQ())) {
-            jqPremium = StringUtils.toDouble(new BigDecimal(rd.getBase().getNBefTaxPrmJQ()).add(new BigDecimal(rd.getBase().getNAppTaxAmtJQ())).toString());
+            jqPremium =
+                    StringUtils.toDouble(new BigDecimal(rd.getBase().getNBefTaxPrmJQ()).add(new BigDecimal(rd.getBase().getNAppTaxAmtJQ())).toString());
         }
         //商业保费 含税
         double syPremium = 0;
         if (StringUtils.isNotEmpty(rd.getBase().getNBefTaxPrmSY())) {
-            syPremium = StringUtils.toDouble(new BigDecimal(rd.getBase().getNBefTaxPrmSY()).add(new BigDecimal(rd.getBase().getNAppTaxAmtSY())).toString());
+            syPremium =
+                    StringUtils.toDouble(new BigDecimal(rd.getBase().getNBefTaxPrmSY()).add(new BigDecimal(rd.getBase().getNAppTaxAmtSY())).toString());
         }
-
+        double jyPremium = 0;
 
         QuoteRespVo quoteRespVo = new QuoteRespVo();
         List<QuoteRiskRespVo> riskList1 = new ArrayList<>();
@@ -257,13 +256,17 @@ public class YcBuildData {
         if (null != rd.getTax()) {
             sumTax = StringUtils.toDouble(rd.getTax().getSumUpTax());
         }
+        //意外险
+        if (null != rd.getProposal()) {
+            jyPremium = StringUtils.toDouble(rd.getProposal().getPremium());
+        }
+        quoteRespVo.setJyPremium(jyPremium);
 
         //保费合计
         double sumPermium = StringUtils.toDouble(rd.getBase().getNPrm());
 
-
         quoteRespVo.setCiSumPermium(BigDecimal.valueOf(jqPremium).add(BigDecimal.valueOf(sumTax)).doubleValue());//交强险和车船税合计
-        quoteRespVo.setSumPermium(BigDecimal.valueOf(sumPermium).add(BigDecimal.valueOf(sumTax)).doubleValue());//保费合计
+        quoteRespVo.setSumPermium(BigDecimal.valueOf(sumPermium).add(BigDecimal.valueOf(sumTax)).add(BigDecimal.valueOf(jyPremium)).doubleValue());//保费合计
         quoteRespVo.setTaxAmount(BigDecimal.valueOf(sumTax).doubleValue());//车船税
         if (null != rd.getPrmCoef()) {
             quoteRespVo.setTotalAdjustRate(StringUtils.toDouble(rd.getPrmCoef().getNTotDisc()));
@@ -308,11 +311,6 @@ public class YcBuildData {
         quoteRespVo.setAccidentInfoStr(String.format("%s%s", ciSB.toString(), biSB.toString()));
 
 
-        //意外险
-        if (null != rd.getProposal()) {
-            quoteRespVo.setJyPremium(StringUtils.toDouble(rd.getProposal().getPremium()));
-        }
-
         //欠税信息
         if (null != rd.getTax()) {
             List<TaxArrears> taxArrearsList = new ArrayList<>();
@@ -326,11 +324,11 @@ public class YcBuildData {
         }
 
 
-
         //平台返回信息
         if (null != rd.getTfiWarnList()) {
             //排空
-            List<TfiWarnListResponse.TfiWarnData> tfiWarnData = rd.getTfiWarnList().getTfiWarnData().stream().filter(item -> null != item).filter(item -> StringUtils.isNotEmpty(item.getWarnMessage())).collect(Collectors.toList());
+            List<TfiWarnListResponse.TfiWarnData> tfiWarnData =
+                    rd.getTfiWarnList().getTfiWarnData().stream().filter(item -> null != item).filter(item -> StringUtils.isNotEmpty(item.getWarnMessage())).collect(Collectors.toList());
             List<String> warnMessageList = new ArrayList<>();
             tfiWarnData.stream().forEach(a -> {
                 warnMessageList.add(a.getWarnMessage());
@@ -437,7 +435,7 @@ public class YcBuildData {
         } else if (responseData.indexOf("<return>") > 0) {
             rStr = responseData.substring(responseData.indexOf("<return>") + 8, responseData.indexOf("</return>"));
         }
-        if(StringUtils.isEmpty(rStr)){
+        if (StringUtils.isEmpty(rStr)) {
             rStr = responseData.substring(responseData.indexOf("<response>") + 10, responseData.indexOf("</response>"));
         }
         String lRStr = rStr.replaceAll("&lt;", "<");

src/main/java/com/ydtech/modules/order/service/impl/YongchengOrderApiServiceImpl.java

@@ -169,26 +169,30 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         }
 
         //车辆年款不能超过注册日期
-        List<ModelsQueryResponse.VehicleInfo> vehicleInfoList = rd.getVehicleInfoList().stream().filter(a -> DateTimeUtil.dateIsAfter(carInfo.getRegisterDate(), a.getVehicleYear())).sorted(Comparator.comparing(ModelsQueryResponse.VehicleInfo::getVehiclePrice)).collect(Collectors.toList());
+        List<ModelsQueryResponse.VehicleInfo> vehicleInfoList =
+                rd.getVehicleInfoList().stream().filter(a -> DateTimeUtil.dateIsAfter(carInfo.getRegisterDate(), a.getVehicleYear())).sorted(Comparator.comparing(ModelsQueryResponse.VehicleInfo::getVehiclePrice)).collect(Collectors.toList());
 
         //匹配的车辆信息数据  为空
         if (CollUtil.isEmpty(vehicleInfoList)) {
 
             //匹配金额
-            vehicleInfoList = rd.getVehicleInfoList().stream().filter(a -> a.getVehiclePrice().equals(carInfo.getPurchasePrice())).collect(Collectors.toList());
+            vehicleInfoList =
+                    rd.getVehicleInfoList().stream().filter(a -> a.getVehiclePrice().equals(carInfo.getPurchasePrice())).collect(Collectors.toList());
             if (CollUtil.isNotEmpty(vehicleInfoList)) {
                 buildCarInfo(carInfo, vehicleInfoList.get(0));
                 return;
             }
 
             //金额升序
-            vehicleInfoList = rd.getVehicleInfoList().stream().sorted(Comparator.comparing(ModelsQueryResponse.VehicleInfo::getVehiclePrice)).collect(Collectors.toList());
+            vehicleInfoList =
+                    rd.getVehicleInfoList().stream().sorted(Comparator.comparing(ModelsQueryResponse.VehicleInfo::getVehiclePrice)).collect(Collectors.toList());
             buildCarInfo(carInfo, vehicleInfoList.get(0));
             return;
         }
 
         //匹配的车辆信息数据
-        ModelsQueryResponse.VehicleInfo matchVehicleInfo = vehicleInfoList.stream().filter(a -> a.getVehiclePrice().equals(carInfo.getPurchasePrice())).findFirst().orElse(null);
+        ModelsQueryResponse.VehicleInfo matchVehicleInfo =
+                vehicleInfoList.stream().filter(a -> a.getVehiclePrice().equals(carInfo.getPurchasePrice())).findFirst().orElse(null);
         if (null != matchVehicleInfo) {
             buildCarInfo(carInfo, matchVehicleInfo);
             return;
@@ -197,7 +201,8 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         //匹配的车辆信息数据里  未匹配成功   默认选择第一条
         //排序  年款降序  金额升序
         vehicleInfoList = vehicleInfoList.stream().sorted(Comparator.comparing(ModelsQueryResponse.VehicleInfo::getVehicleYear)
-                        .thenComparing((o1, o2) -> Integer.compare(StringUtils.toInt(o2.getVehiclePrice()), StringUtils.toInt(o1.getVehiclePrice()))).reversed())
+                        .thenComparing((o1, o2) -> Integer.compare(StringUtils.toInt(o2.getVehiclePrice()),
+                                StringUtils.toInt(o1.getVehiclePrice()))).reversed())
                 .collect(Collectors.toList());
 
         buildCarInfo(carInfo, vehicleInfoList.get(0));
@@ -343,7 +348,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
         QuoteRespVo quoteRespVo = YcBuildData.buildQuoteRespVo(order, rr, yaQuoteInfoVo);
         //8 生成订单
-        InsAreaCompany iac = responseOrder(order, quoteRespVo, m, rr, quoteVo);
+        InsAreaCompany iac = responseOrder(order, quoteRespVo, rr, quoteVo);
         quoteRespVo.setCompanyId(iac.getId());
         order.setOwnerinfo(JSON.parseObject(JSON.toJSONString(yaQuoteInfoVo.getOwnerInfo())));
         order.setInsureinfo(JSON.parseObject(JSON.toJSONString(yaQuoteInfoVo.getInsuredPersonInfo())));
@@ -372,7 +377,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
             log.info("永诚API方式 - xml请求 ------------报价 ->   交强重复投保----------------");
 
             //截取0 到 机动车交通事故强制险
-            if(!errorMsg.contains("终保日期")){
+            if (!errorMsg.contains("终保日期")) {
                 throw new SystemException(errorMsg);
             }
             String coverageEndDate = errorMsg.substring(errorMsg.indexOf("终保日期") + 5, errorMsg.indexOf("终保日期") + 5 + 16);
@@ -412,15 +417,15 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
             log.info("永诚API方式 - xml请求 ------------报价 ->   商业险重复投保----------------");
 
             //保险止期
-            if(!errorMsg.contains("保险止期")){
+            if (!errorMsg.contains("保险止期")) {
                 throw new SystemException(errorMsg);
             }
             String coverageEndDate = errorMsg.substring(errorMsg.indexOf("保险止期") + 6, errorMsg.indexOf("保险止期") + 6 + 19);
             LocalDateTime start;
 
-            if(coverageEndDate.contains("23:59:59")){
+            if (coverageEndDate.contains("23:59:59")) {
                 start = DateTimeUtil.parseLocalDateTime(coverageEndDate, DateTimeUtil.DATETIME_PATTERN).plusSeconds(1);
-            }else {
+            } else {
                 start = DateTimeUtil.parseLocalDateTime(coverageEndDate, DateTimeUtil.DATETIME_PATTERN);
             }
 
@@ -523,7 +528,8 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
             //转保调用自动识别转保码
             if (StringUtils.isNotEmpty(cCheckCodeJQ) || StringUtils.isNotEmpty(cCheckCodeSY)) {
-                log.info(String.format("永诚API方式 - xml请求 报价，车牌号《%s》 ->   转保业务处理----------------", m.getRequestLabel().getCondition().getVhl().getCPlateNo()));
+                log.info(String.format("永诚API方式 - xml请求 报价，车牌号《%s》 ->   转保业务处理----------------",
+                        m.getRequestLabel().getCondition().getVhl().getCPlateNo()));
 
                 requestInfoList.add(rr.getHead().getErrorMessage());
                 //调用python ocr
@@ -748,7 +754,8 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
             } else {
                 //失败原因
-                log.info(String.format("永诚API方式 - 补传回调 - 失败，交强保单号：{} ，商业保单号：{}，类型：{}", param.getCiPolicyNo(), param.getBizPolicyNo(), param.getType()));
+                log.info(String.format("永诚API方式 - 补传回调 - 失败，交强保单号：{} ，商业保单号：{}，类型：{}", param.getCiPolicyNo(), param.getBizPolicyNo(),
+                        param.getType()));
                 return HttpResult.error(param.getMessage());
             }
             return HttpResult.ok("操作成功，状态已更新。");
@@ -786,50 +793,11 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         String jqbz = "-交强险标志.pdf";
         String jqbd = "-交强险保单.pdf";
         String sybd = "-商业险保单.pdf";
+        String jybd = "-非车险保单.pdf";
 
         String licensePlate = order.getLicenseno();
-
         CarInsPolicyDto cipDto = new CarInsPolicyDto();
 
-        String insFlag = "dj";
-
-        if (StringUtils.isNotEmpty(iac.getJqapplyno()) && StringUtils.isNotEmpty(iac.getSyapplyno())) {
-            insFlag = "js";
-        }
-        if (StringUtils.isEmpty(iac.getJqapplyno()) && StringUtils.isNotEmpty(iac.getSyapplyno())) {
-            insFlag = "ds";
-        }
-
-        //单交
-        if (insFlag.equals("dj")) {
-            String jqFlagUrl = gainExistCarInsPolicy(licensePlate + jqbz, licensePlate);
-            String jqUrl = gainExistCarInsPolicy(licensePlate + jqbd, licensePlate);
-
-            if (StringUtils.isNotEmpty(jqFlagUrl) && StringUtils.isNotEmpty(jqUrl)) {
-                cipDto.setJqFlagUrl(jqFlagUrl);
-                cipDto.setJqUrl(jqUrl);
-                return HttpResult.ok(cipDto);
-            }
-
-        } else if (insFlag.equals("ds")) {//单商
-            String syUrl = gainExistCarInsPolicy(licensePlate + sybd, licensePlate);
-            if (StringUtils.isNotEmpty(syUrl)) {
-                cipDto.setSyUrl(syUrl);
-                return HttpResult.ok(cipDto);
-            }
-        } else if (insFlag.equals("js")) {//交商业
-            String syUrl = gainExistCarInsPolicy(licensePlate + sybd, licensePlate);
-            String jqFlagUrl = gainExistCarInsPolicy(licensePlate + jqbz, licensePlate);
-            String jqUrl = gainExistCarInsPolicy(licensePlate + jqbd, licensePlate);
-
-            if (StringUtils.isNotEmpty(jqFlagUrl) && StringUtils.isNotEmpty(jqUrl) && StringUtils.isNotEmpty(syUrl)) {
-                cipDto.setJqFlagUrl(jqFlagUrl);
-                cipDto.setJqUrl(jqUrl);
-                cipDto.setSyUrl(syUrl);
-                return HttpResult.ok(cipDto);
-            }
-        }
-
         // 获取协议配置信息
         YcConfigureParameters ycConfigureParameters = gainYcConfigParams(iac.getAgreementId());
         String policyNo = policyPrintVo.getRiskCode().equals("0507") ? iac.getJqpolicyno() : iac.getSypolicyno();
@@ -864,6 +832,13 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
                 }
 
+                // 非车险
+                if (StringUtils.isNotEmpty(pResp.getYwpolicUrl())) {
+                    String jyInsUrl = pResp.getYwpolicUrl().replaceAll(";pkid", "&pkid");
+                    String jyUrl = gainCarInsPolicy(jyInsUrl, licensePlate + jybd, licensePlate);
+                    cipDto.setJyUrl(jyUrl);
+                }
+
                 return HttpResult.ok(pResp.getHead().getResponseCompleteMessageStatus().getMessageStatusDescription(), cipDto);
 
             } else {
@@ -968,7 +943,8 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
         //将insAttachInsureList存入redis
         if (!insAttachInsureList.isEmpty()) {
-            redisTemplate.opsForValue().set(redisKey.toString(), JSON.toJSONString(insAttachInsureList), YC_ACCIDENTAL_DRIVING_TIME, TimeUnit.DAYS);
+            redisTemplate.opsForValue().set(redisKey.toString(), JSON.toJSONString(insAttachInsureList), YC_ACCIDENTAL_DRIVING_TIME,
+                    TimeUnit.DAYS);
         }
 
         return HttpResult.ok(insAttachInsureList);
@@ -1013,7 +989,8 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
         //将esmInsAttachInsureDetails存入redis
         if (!esmInsAttachInsureDetails.isEmpty()) {
-            redisTemplate.opsForValue().set(redisKey.toString(), JSON.toJSONString(esmInsAttachInsureDetails), YC_ACCIDENTAL_DRIVING_TIME, TimeUnit.DAYS);
+            redisTemplate.opsForValue().set(redisKey.toString(), JSON.toJSONString(esmInsAttachInsureDetails), YC_ACCIDENTAL_DRIVING_TIME
+                    , TimeUnit.DAYS);
         }
         return HttpResult.ok(esmInsAttachInsureDetails);
     }
@@ -1144,7 +1121,8 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         } else {
             //失败原因
             param.getMessage();
-            log.info(String.format("永诚API方式 - 回调 - 失败，交强保单号：{} ，商业保单号：{}，类型：{}", param.getCiPolicyNo(), param.getBizPolicyNo(), param.getType()));
+            log.info(String.format("永诚API方式 - 回调 - 失败，交强保单号：{} ，商业保单号：{}，类型：{}", param.getCiPolicyNo(), param.getBizPolicyNo(),
+                    param.getType()));
         }
         return HttpResult.ok(param);
     }
@@ -1177,11 +1155,15 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
      * @author: lig
      * @date: 2023年02月16日 0016
      */
-    private InsAreaCompany responseOrder(InsOrders insOrder, QuoteRespVo quoteRespVo, Ruote requestData, RuoteResponse responseData, BaseQuoteVo<AccidentalDrivingVo> quoteVo) {
+    private InsAreaCompany responseOrder(InsOrders insOrder, QuoteRespVo quoteRespVo, RuoteResponse responseData,
+                                         BaseQuoteVo<AccidentalDrivingVo> quoteVo) {
+
         //交强保费 含税
-        double jqPremium = StringUtils.toDouble(responseData.getBase().getNBefTaxPrmJQ()) + StringUtils.toDouble(responseData.getBase().getNAppTaxAmtJQ());
+        double jqPremium =
+                StringUtils.toDouble(responseData.getBase().getNBefTaxPrmJQ()) + StringUtils.toDouble(responseData.getBase().getNAppTaxAmtJQ());
         //商业保费 含税
-        double syPremium = StringUtils.toDouble(responseData.getBase().getNBefTaxPrmSY()) + StringUtils.toDouble(responseData.getBase().getNAppTaxAmtSY());
+        double syPremium =
+                StringUtils.toDouble(responseData.getBase().getNBefTaxPrmSY()) + StringUtils.toDouble(responseData.getBase().getNAppTaxAmtSY());
         //保险公司订单号
         String insOrderNo = responseData.getBase().getCresvTxt6();
 
@@ -1189,7 +1171,6 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         String queryCodeJq = responseData.getVhl().getCQryCdeJQ();
         //查询码商业
         String queryCodeSy = responseData.getVhl().getCQryCdeSY();
-
         EsmInsCompany eic = esmInsCompanyService.getById(quoteVo.getCompanyId());
 
         boolean jqFalg = jqPremium > 0;
@@ -1203,6 +1184,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         insAreaCompany.setSumpremium(BigDecimal.valueOf(quoteRespVo.getSumPermium()));
         insAreaCompany.setOrderstatus(InsOrderStatusEnum.QUOTE_ING.getCode());
 
+        insAreaCompany.setJypremium(BigDecimal.valueOf(quoteRespVo.getJyPremium()));
         insAreaCompany.setCreatetime(LocalDateTime.now());
         insAreaCompany.setInsOrderNo(insOrderNo);
         insAreaCompany.setJqapplyno(queryCodeJq);
@@ -1530,7 +1512,8 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
     }
 
-    private void buildRegionParam(Ruote m, BaseQuoteInfoVo yaQuoteInfoVo, List<String> ownerProvinceData, List<String> insuredProvinceData, List<String> applicantProvinceData) {
+    private void buildRegionParam(Ruote m, BaseQuoteInfoVo yaQuoteInfoVo, List<String> ownerProvinceData,
+                                  List<String> insuredProvinceData, List<String> applicantProvinceData) {
         yaQuoteInfoVo.getOwnerInfo().setProvinceData(ownerProvinceData);
         m.getRequestLabel().getCondition().getVhlowner().setCProvince(ownerProvinceData.get(0));
         m.getRequestLabel().getCondition().getVhlowner().setCCity(ownerProvinceData.get(1));