国任修改驾意险返回

紫金修改保费返回

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

@@ -11,8 +11,17 @@ import lombok.Data;
 @Data
 public class CarInsPolicyDto {
 
-    private String jqFlagUrl; //交强险标志地址
+    /**
+     * 交强险标志地址
+     */
+    private String jqFlagUrl; //
+    /**
+     * 交强险保单地址
+     */
     private String jqUrl; //交强险保单地址
-    private String syUrl; //商业险保单地址
+    /**
+     * 商业险保单地址
+     */
+    private String syUrl;
 
 }

src/main/java/com/ydtech/modules/ins/model/guoren/PremiumReq.java

@@ -435,8 +435,7 @@ public class PremiumReq {
                 prptitemkind.setKindName(InsurKindGuoRen.SY_FJ_YBW1.getDesc());
                 prptitemkind.setItemKindNo(InsurKindGuoRen.SY_FJ_YBW1.getItemKindNo());
                 prptitemkind.setFlag(InsurKindGuoRen.SY_FJ_YBW1.getFlag());
-//                prptitemkind.setAmount(StringUtils.toString(k.getAmount()));
-                prptitemkind.setUnitAmount(StringUtils.toString(k.getAmount()));
+                prptitemkind.setUnitAmount("0");
                 prptitemkind.setMainKindFlag("S");
                 prptitemkind.setAmount(StringUtils.toString(k.getAmount()));
             }

src/main/java/com/ydtech/modules/ins/model/yc/policy/response/PolicyResponse.java

@@ -16,41 +16,34 @@ import lombok.Data;
 @JacksonXmlRootElement(localName = "packet")
 public class PolicyResponse {
 
-
     @JacksonXmlProperty(localName = "head")
     private Head head;
 
     @JacksonXmlProperty(localName = "sypolicyUrl")
     private String sypolicyUrl;
+
     @JacksonXmlProperty(localName = "jqpolicyUrl")
     private String jqpolicyUrl;
+
     @JacksonXmlProperty(localName = "policyBZUrl")
     private String policyBZUrl;
+
     //非车险电子保单
     @JacksonXmlProperty(localName = "ywpolicUrl")
     private String ywpolicUrl;
 
-//    @JacksonXmlProperty(localName = "queryResult")
-//    private QueryResult queryResult;
-
-
     @Data
     public static class Head {
         @JacksonXmlProperty(localName = "responseCompleteMessageStatus")
         private ResponseCompleteMessageStatus responseCompleteMessageStatus;
     }
 
-    //    @Data
-//    public static class QueryResult{
-//        @JacksonXmlProperty(localName = "sypolicyUrl")
-//        private String sypolicyUrl;
-//        @JacksonXmlProperty(localName = "jqpolicyUrl")
-//        private String jqpolicyUrl;
-//    }
+
     @Data
     public static class ResponseCompleteMessageStatus {
         @JacksonXmlProperty(localName = "messageStatusCode")
         private String messageStatusCode;
+
         @JacksonXmlProperty(localName = "messageStatusDescription")
         private String messageStatusDescription;
     }

src/main/java/com/ydtech/modules/order/controller/YongChengOrderApiController.java

@@ -38,16 +38,10 @@ public class YongChengOrderApiController {
 
     private final YongchengOrderApiService yongchengOrderApiService;
 
-    private final EsmInsAttachInsureMapper esmInsAttachInsureMapper;
-
-    private final EsmInsAttachInsureDetailsMapper esmInsAttachInsureDetailsMapper;
-
     private final InsAreaCompanyService insAreaCompanyService;
 
-    public YongChengOrderApiController(YongchengOrderApiService yongchengOrderApiService, EsmInsAttachInsureMapper esmInsAttachInsureMapper, EsmInsAttachInsureDetailsMapper esmInsAttachInsureDetailsMapper, InsAreaCompanyService insAreaCompanyService) {
+    public YongChengOrderApiController(YongchengOrderApiService yongchengOrderApiService, InsAreaCompanyService insAreaCompanyService) {
         this.yongchengOrderApiService = yongchengOrderApiService;
-        this.esmInsAttachInsureMapper = esmInsAttachInsureMapper;
-        this.esmInsAttachInsureDetailsMapper = esmInsAttachInsureDetailsMapper;
         this.insAreaCompanyService = insAreaCompanyService;
     }
 
@@ -64,7 +58,6 @@ public class YongChengOrderApiController {
 
     @ApiOperation(value = "永诚API方式 - 核保")
     @PostMapping("/audit")
-//    @MethodLogAnnotation(title = "永诚API方式 - 核保")
     public HttpResult auditApi(@RequestSingleParam(value = "companyId") String companyId) {
         return yongchengOrderApiService.auditApi(companyId);
     }
@@ -72,7 +65,6 @@ public class YongChengOrderApiController {
     @ApiOperation(value = "永诚API方式 - 影像上传")
     @PostMapping(value = "/uploadImage")
     public HttpResult uploadImageApi(@RequestSingleParam(value = "companyId") String companyId) {
-
         return yongchengOrderApiService.uploadImageApi(companyId);
     }
 
@@ -114,10 +106,6 @@ public class YongChengOrderApiController {
     @ApiOperation(value = "永诚API方式 -意外险列表")
     @PostMapping("/gainAccidentList")
     public HttpResult<List<EsmInsAttachInsure>> gainAccidentList(@RequestBody @Valid AccidentalDrivingQueryVo accidentalDrivingVo) {
-//        LambdaQueryWrapper<EsmInsAttachInsure> lqw = new LambdaQueryWrapper<EsmInsAttachInsure>();
-//        lqw.eq(EsmInsAttachInsure::getCompanyId, accidentalDrivingVo.getCompanyCode());
-//        lqw.eq(accidentalDrivingVo.getSeatNum() > 0, EsmInsAttachInsure::getSeating, accidentalDrivingVo.getSeatNum());
-//        List<EsmInsAttachInsure> eiaiList = esmInsAttachInsureMapper.selectList(lqw);
         return yongchengOrderApiService.accidentQuery(accidentalDrivingVo);
     }
 
@@ -130,10 +118,6 @@ public class YongChengOrderApiController {
             @ApiImplicitParam(name = "accidentId", value = "意外险ID", required = true, paramType = "body")
     })
     public HttpResult<List<EsmInsAttachInsureDetails>> gainAccidentSchemeList(@RequestBody @Valid AccidentalDrivingQueryVo accidentalDrivingVo) {
-//        LambdaQueryWrapper<EsmInsAttachInsureDetails> lqw = new LambdaQueryWrapper<>();
-//        lqw.eq(EsmInsAttachInsureDetails::getAttachInsureId, accidentId);
-//        List<EsmInsAttachInsureDetails> list = esmInsAttachInsureDetailsMapper.selectList(lqw);
-
         return yongchengOrderApiService.accidentSchemeList(accidentalDrivingVo);
     }
 

src/main/java/com/ydtech/modules/order/entity/crawler/vo/CrawlerPolicyPrintVo.java

@@ -47,10 +47,6 @@ public class CrawlerPolicyPrintVo implements Serializable {
         @JsonProperty("application")
         private String application;
 
-        public JyxInfoListDTO(CrawlerPolicyPrintResponse.JyxInfoListDTO jyxInfoListDTO) {
-            this.jyxPolicyUrl = jyxInfoListDTO.getJyxPolicyUrl();
-            this.application = jyxInfoListDTO.getApplication();
-        }
 
     }
 

src/main/java/com/ydtech/modules/order/service/YongchengOrderApiService.java

@@ -40,7 +40,6 @@ public interface YongchengOrderApiService {
      * 包含发送短信
      * 5 获取支付url(提交短信验证码)
      */
-//    HttpResult getPayUrlApi(String quoteOrderNo);
     InsAreaCompany getPayUrlApi(InsAreaCompany iac);
 
     /**

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

@@ -738,6 +738,27 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
             kind.setAmount(dto.getAmount());
             kind.setCoveragePremium(dto.getPremium());
         }
+        if (dto.getKindCode().equals(InsurKindGuoRen.SY_FJ_YBW1.getCode())) {
+            kind = new QuoteKindRespVo();
+            kind.setKindCode(InsurKind.SY_FJ_YBW1.getCode());
+            kind.setKindName(InsurKind.SY_FJ_YBW1.getDesc());
+            kind.setAmount(dto.getAmount());
+            kind.setCoveragePremium(dto.getPremium());
+        }
+        if (dto.getKindCode().equals(InsurKindGuoRen.SY_FJ_YBW2.getCode())) {
+            kind = new QuoteKindRespVo();
+            kind.setKindCode(InsurKind.SY_FJ_YBW2.getCode());
+            kind.setKindName(InsurKind.SY_FJ_YBW2.getDesc());
+            kind.setAmount(dto.getAmount());
+            kind.setCoveragePremium(dto.getPremium());
+        }
+        if (dto.getKindCode().equals(InsurKindGuoRen.SY_FJ_YBW3.getCode())) {
+            kind = new QuoteKindRespVo();
+            kind.setKindCode(InsurKind.SY_FJ_YBW3.getCode());
+            kind.setKindName(InsurKind.SY_FJ_YBW3.getDesc());
+            kind.setAmount(dto.getAmount());
+            kind.setCoveragePremium(dto.getPremium());
+        }
         return kind;
     }
 

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

@@ -70,7 +70,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
     @Value("${api.url}")
     private String apiUrl;
 
-    public InsCrawlerOrderServiceImpl(PtlCrawlerApiService ptlCrawlerApiService, InsCrawlerOrderComponents insCrawlerOrderComponents, PtlAgreementAttributionService ptlAgreementAttributionService, InsAreaCompanyService insAreaCompanyService, InsTaskImagesService insTaskImagesService, InsOrdersService insOrdersService, PtlAgreementService ptlAgreementService,FeeRuleSchemeService feeRuleSchemeService) {
+    public InsCrawlerOrderServiceImpl(PtlCrawlerApiService ptlCrawlerApiService, InsCrawlerOrderComponents insCrawlerOrderComponents, PtlAgreementAttributionService ptlAgreementAttributionService, InsAreaCompanyService insAreaCompanyService, InsTaskImagesService insTaskImagesService, InsOrdersService insOrdersService, PtlAgreementService ptlAgreementService, FeeRuleSchemeService feeRuleSchemeService) {
         this.ptlCrawlerApiService = ptlCrawlerApiService;
         this.insCrawlerOrderComponents = insCrawlerOrderComponents;
         this.ptlAgreementAttributionService = ptlAgreementAttributionService;
@@ -113,12 +113,12 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         }
         QuoteRespVo quoteRespVo = getQuoteRespVo(response, quoteInfoVo);
         //添加调用费用匹配功能
-        String insCom="";
-        if(ptlAgreementAttribution.getInsCompanyId()!=null&&ptlAgreementAttribution.getInsCompanyId().length()>4){
-            insCom=ptlAgreementAttribution.getInsCompanyId().substring(0,4);
+        String insCom = "";
+        if (ptlAgreementAttribution.getInsCompanyId() != null && ptlAgreementAttribution.getInsCompanyId().length() > 4) {
+            insCom = ptlAgreementAttribution.getInsCompanyId().substring(0, 4);
         }
         //(先开启众安的)
-        if("ZAPA".equals(insCom)){
+        if ("ZAPA".equals(insCom)) {
             feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(), response.getOrderNo());
         }
 
@@ -213,7 +213,12 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         crawlerPolicyPrintVo.setJqxFlagUrl(gainCarInsPolicy(response.getJqxFlagUrl(), licensePlate + "-交强险标志.pdf", licensePlate));
         crawlerPolicyPrintVo.setJqxPolicyUrl(gainCarInsPolicy(response.getJqxPolicyUrl(), licensePlate + "-交强险保单.pdf", licensePlate));
         crawlerPolicyPrintVo.setSyxPolicyUrl(gainCarInsPolicy(response.getSyxPolicyUrl(), licensePlate + "-商业险保单.pdf", licensePlate));
-        crawlerPolicyPrintVo.setJyxInfoList(response.getJyxInfoList().stream().map(CrawlerPolicyPrintVo.JyxInfoListDTO::new).collect(Collectors.toList()));
+        crawlerPolicyPrintVo.setJyxInfoList(response.getJyxInfoList().stream().map(x -> {
+            CrawlerPolicyPrintVo.JyxInfoListDTO jyxInfoListDTO = new CrawlerPolicyPrintVo.JyxInfoListDTO();
+            jyxInfoListDTO.setApplication(x.getApplication());
+            jyxInfoListDTO.setJyxPolicyUrl(gainCarInsPolicy(x.getJyxPolicyUrl(), licensePlate + "-" + x.getApplication() + "-非车险保单.pdf", licensePlate));
+            return jyxInfoListDTO;
+        }).collect(Collectors.toList()));
         return HttpResult.ok(crawlerPolicyPrintVo);
     }
 

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

@@ -500,7 +500,6 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
             m.getRequestLabel().getCondition().getVhl().setCBusType("0");
             m.getRequestLabel().getCondition().getVhl().setCQryCdeJQ("");
             m.getRequestLabel().getCondition().getVhl().setCQryCdeSY("");
-
             m.getRequestLabel().getCondition().getVhl().setCCheckCodeJQ("");
             m.getRequestLabel().getCondition().getVhl().setCCheckCodeSY("");
             return false;
@@ -784,11 +783,6 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         AssertionUtils.isEmpty(iac, "报价订单不存在");
         InsOrders order = insOrdersService.getById(iac.getOrderno());
 
-        String ip = IPUtil.gainServerNetIp("eth0");
-        log.debug("------------------------------");
-        log.debug("----测试服务器IP----" + ip);
-        log.debug("------------------------------");
-
         String jqbz = "-交强险标志.pdf";
         String jqbd = "-交强险保单.pdf";
         String sybd = "-商业险保单.pdf";
@@ -869,6 +863,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
                     cipDto.setSyUrl(syUrl);
 
                 }
+
                 return HttpResult.ok(pResp.getHead().getResponseCompleteMessageStatus().getMessageStatusDescription(), cipDto);
 
             } else {

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

@@ -80,7 +80,13 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
     @Value("${api.url}")
     private String apiUrl;
 
-    public ZijinOrderApiServiceImpl(ZijinRequestApiComponents zijinRequestApiComponents, InsAreaCompanyService insAreaCompanyService, InsOrdersService insOrdersService, InsTaskImagesService insTaskImagesService, PtlAgreementAttributionService ptlAgreementAttributionService, ConfigureParametersComponents configureParametersComponents,FeeRuleSchemeService feeRuleSchemeService) {
+    public ZijinOrderApiServiceImpl(ZijinRequestApiComponents zijinRequestApiComponents,
+                                    InsAreaCompanyService insAreaCompanyService,
+                                    InsOrdersService insOrdersService,
+                                    InsTaskImagesService insTaskImagesService,
+                                    PtlAgreementAttributionService ptlAgreementAttributionService,
+                                    ConfigureParametersComponents configureParametersComponents,
+                                    FeeRuleSchemeService feeRuleSchemeService) {
         this.zijinRequestApiComponents = zijinRequestApiComponents;
         this.insAreaCompanyService = insAreaCompanyService;
         this.insOrdersService = insOrdersService;
@@ -93,11 +99,16 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
     @Override
     public HttpResult<List<QueryVehicProductsResponse.ProductDtoListDTO>> queryVehicleProducts(ZjVehicleProductsQueryVo zjVehicleProductsQueryVo) {
         // 1 通过 协议id获取配置实体
-        ZjConfigureParameters zjConfigureParameters = configureParametersComponents.toEntity(ZjConfigureParameters.class, zjVehicleProductsQueryVo.getAgreementId());
+        ZjConfigureParameters zjConfigureParameters =
+                configureParametersComponents.toEntity(ZjConfigureParameters.class,
+                        zjVehicleProductsQueryVo.getAgreementId());
         HttpHeaders httpHeaders = zijinRequestApiComponents.getHttpHeaders(zjVehicleProductsQueryVo.getAgreementId());
         // 2. 请求驾意险
-        QueryVehicProductsRequest queryVehicProductsRequest = new QueryVehicProductsRequest(zjVehicleProductsQueryVo.getSeatCount(), zjConfigureParameters.getAppKey(), zjConfigureParameters.getProposalCityCode());
-        QueryVehicProductsResponse queryVehicProductsResponse = zijinRequestApiComponents.queryVehicleProducts(queryVehicProductsRequest, httpHeaders);
+        QueryVehicProductsRequest queryVehicProductsRequest =
+                new QueryVehicProductsRequest(zjVehicleProductsQueryVo.getSeatCount(),
+                        zjConfigureParameters.getAppKey(), zjConfigureParameters.getProposalCityCode());
+        QueryVehicProductsResponse queryVehicProductsResponse =
+                zijinRequestApiComponents.queryVehicleProducts(queryVehicProductsRequest, httpHeaders);
         return HttpResult.ok(queryVehicProductsResponse.getProductDtoList());
     }
 
@@ -109,14 +120,16 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         // 1.1 账号信息
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(agreementId);
         // 1.2 通过 协议id获取配置实体
-        ZjConfigureParameters zjConfigureParameters = configureParametersComponents.toEntity(ZjConfigureParameters.class, ptlAgreementAttribution);
-        HttpHeaders httpHeaders = zijinRequestApiComponents.getHttpHeaders(zjConfigureParameters, ZijinRequestApiComponents.RECURSIVE_HIERARCHY);
+        ZjConfigureParameters zjConfigureParameters =
+                configureParametersComponents.toEntity(ZjConfigureParameters.class, ptlAgreementAttribution);
+        HttpHeaders httpHeaders = zijinRequestApiComponents.getHttpHeaders(zjConfigureParameters,
+                ZijinRequestApiComponents.RECURSIVE_HIERARCHY);
         // 2. 查询车型
         ModelQueryRequest modelQueryRequest = new ModelQueryRequest(quoteInfoVo.getCarInfo(), zjConfigureParameters);
         ModelQueryResponse modelQueryResponse = zijinRequestApiComponents.modelQuery(modelQueryRequest, httpHeaders);
         // 2.1 过滤车型
-        ModelQueryResponse.VehicleModelInfosDTO vehicleModelInfosDTO
-                = new CarModelsFilterUtils<ModelQueryResponse.VehicleModelInfosDTO>().to(modelQueryResponse.getVehicleModelInfos(), quoteInfoVo.getCarInfo());
+        ModelQueryResponse.VehicleModelInfosDTO vehicleModelInfosDTO =
+                new CarModelsFilterUtils<ModelQueryResponse.VehicleModelInfosDTO>().to(modelQueryResponse.getVehicleModelInfos(), quoteInfoVo.getCarInfo());
         // 3. 计算车辆实际价值
         String purchasePrice = vehicleModelInfosDTO.getPurchasePrice();
         String seatCount = vehicleModelInfosDTO.getSeatCount();
@@ -127,27 +140,40 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         if (riskList.size() == 1 && InsuranceRisk.TRAFFIC.getCode().equals(riskList.get(0).getRiskCode())) {
             startDate = riskList.get(0).getStartDate();
         } else {
-            startDate = Objects.requireNonNull(riskList.stream().filter(x -> InsuranceRisk.BUSINESS.getCode().equals(x.getRiskCode())).findFirst().orElse(null)).getStartDate();
+            startDate = Objects.requireNonNull(riskList.stream()
+                            .filter(x -> InsuranceRisk.BUSINESS.getCode().equals(x.getRiskCode()))
+                            .findFirst()
+                            .orElse(null))
+                    .getStartDate();
         }
 
-        QueryActualValueRequest queryActualValueRequest = new QueryActualValueRequest(carInfo.getRegisterDate(), purchasePrice, seatCount, startDate);
-        QueryActualValueResponse queryActualValueResponse = zijinRequestApiComponents.queryActualValue(queryActualValueRequest, httpHeaders);
+        QueryActualValueRequest queryActualValueRequest = new QueryActualValueRequest(carInfo.getRegisterDate(),
+                purchasePrice, seatCount, startDate);
+        QueryActualValueResponse queryActualValueResponse =
+                zijinRequestApiComponents.queryActualValue(queryActualValueRequest, httpHeaders);
         // 4. 报价
         CalculatePremiumRequest calculatePremiumRequest
-                = new CalculatePremiumRequest(quoteInfoVo, vehicleModelInfosDTO, queryActualValueResponse.getActualValue(), quoteVo.getAccidentalDrivingVo(), zjConfigureParameters, modelQueryResponse);
+                = new CalculatePremiumRequest(quoteInfoVo, vehicleModelInfosDTO,
+                queryActualValueResponse.getActualValue(), quoteVo.getAccidentalDrivingVo(), zjConfigureParameters,
+                modelQueryResponse);
 
         String message = "";
-        CalculatePremiumResponse calculatePremiumResponse = zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders, modelQueryRequest, message, queryActualValueRequest, true);
+        CalculatePremiumResponse calculatePremiumResponse =
+                zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders, modelQueryRequest,
+                        message, queryActualValueRequest, true);
         // 警告信息
-        QuoteRespVo quoteRespVo = getQuoteRespVo(calculatePremiumResponse, quoteInfoVo, quoteVo.getAccidentalDrivingVo());
+        QuoteRespVo quoteRespVo = getQuoteRespVo(calculatePremiumResponse, quoteInfoVo,
+                quoteVo.getAccidentalDrivingVo());
         if (!StringUtils.isEmpty(message)) {
             ArrayList<String> objects = new ArrayList<>();
             objects.add(message);
             quoteRespVo.setWarnMessageList(objects);
         }
         //添加调用费用匹配功能
-        feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(), calculatePremiumRequest.getOrderId());
-        return responseOrder(calculatePremiumResponse, quoteRespVo, ptlAgreementAttribution, calculatePremiumRequest.getOrderId(), calculatePremiumRequest.getOrderNo());
+        feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(),
+                calculatePremiumRequest.getOrderId());
+        return responseOrder(calculatePremiumResponse, quoteRespVo, ptlAgreementAttribution,
+                calculatePremiumRequest.getOrderId(), calculatePremiumRequest.getOrderNo());
     }
 
     @Override
@@ -162,13 +188,15 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         // 2.1 获取交强险特约
         if (insAreaCompany.getJqpremium().intValue() != 0) {
             queryClauseDataRequest.setRiskCode(RiskCodeEnum.RC_0590.getCode());
-            QueryClauseDataResponse queryClauseDataResponse = zijinRequestApiComponents.queryClauseData(queryClauseDataRequest, httpHeaders);
+            QueryClauseDataResponse queryClauseDataResponse =
+                    zijinRequestApiComponents.queryClauseData(queryClauseDataRequest, httpHeaders);
             clauseInfoDtoList.addAll(queryClauseDataResponse.getClauseInfoDtoList());
         }
         // 2.2 获取商业险特约特约
         if (insAreaCompany.getSypremium().intValue() != 0) {
             queryClauseDataRequest.setRiskCode(RiskCodeEnum.RC_050A.getCode());
-            QueryClauseDataResponse queryClauseDataResponse = zijinRequestApiComponents.queryClauseData(queryClauseDataRequest, httpHeaders);
+            QueryClauseDataResponse queryClauseDataResponse =
+                    zijinRequestApiComponents.queryClauseData(queryClauseDataRequest, httpHeaders);
             clauseInfoDtoList.addAll(queryClauseDataResponse.getClauseInfoDtoList());
         }
         return HttpResult.ok(clauseInfoDtoList);
@@ -181,16 +209,21 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
 
         // 1 通过 协议id获取配置实体
-        PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(insAreaCompany.getAgreementId());
-        ZjConfigureParameters zjConfigureParameters = configureParametersComponents.toEntity(ZjConfigureParameters.class, ptlAgreementAttribution);
-        HttpHeaders httpHeaders = zijinRequestApiComponents.getHttpHeaders(zjConfigureParameters, ZijinRequestApiComponents.RECURSIVE_HIERARCHY);
+        PtlAgreementAttribution ptlAgreementAttribution =
+                ptlAgreementAttributionService.getById(insAreaCompany.getAgreementId());
+        ZjConfigureParameters zjConfigureParameters =
+                configureParametersComponents.toEntity(ZjConfigureParameters.class, ptlAgreementAttribution);
+        HttpHeaders httpHeaders = zijinRequestApiComponents.getHttpHeaders(zjConfigureParameters,
+                ZijinRequestApiComponents.RECURSIVE_HIERARCHY);
 
         // 2 提交核保
         String productid = insOrders.getProductid();
 
-        SubmitVerifyRequest submitVerifyRequest = new SubmitVerifyRequest(insAreaCompany.getInsOrderNo(), insAreaCompany.getId(), productid, specialAudit.getEngageList());
+        SubmitVerifyRequest submitVerifyRequest = new SubmitVerifyRequest(insAreaCompany.getInsOrderNo(),
+                insAreaCompany.getId(), productid, specialAudit.getEngageList());
         try {
-            SubmitVerifyResponse submitVerifyResponse = zijinRequestApiComponents.submitVerify(submitVerifyRequest, httpHeaders);
+            SubmitVerifyResponse submitVerifyResponse = zijinRequestApiComponents.submitVerify(submitVerifyRequest,
+                    httpHeaders);
             SubmitVerifyResponse.SubmitVerifyInfoDTO submitVerifyInfo = submitVerifyResponse.getSubmitVerifyInfo();
             insAreaCompany.setJqpolicyno(submitVerifyInfo.getPolicyNoCI());
             insAreaCompany.setSypolicyno(submitVerifyInfo.getPolicyNo());
@@ -200,16 +233,21 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
             // 3. 聚合支付服务
             BigDecimal multiply = insAreaCompany.getSumpremium().multiply(new BigDecimal(100));
-            ZbfAggregatePayRequest zbfAggregatePayRequest = new ZbfAggregatePayRequest(String.valueOf(multiply.intValue()), zjConfigureParameters.getAppKey(), insAreaCompany.getId());
-            ZbfAggregatePayResponse zbfAggregatePayResponse = zijinRequestApiComponents.zbfAggregatePay(zbfAggregatePayRequest, httpHeaders);
+            ZbfAggregatePayRequest zbfAggregatePayRequest =
+                    new ZbfAggregatePayRequest(String.valueOf(multiply.intValue()), zjConfigureParameters.getAppKey()
+                            , insAreaCompany.getId());
+            ZbfAggregatePayResponse zbfAggregatePayResponse =
+                    zijinRequestApiComponents.zbfAggregatePay(zbfAggregatePayRequest, httpHeaders);
             insAreaCompany.setPaymentLink(zbfAggregatePayResponse.getPayUrl());
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
             return HttpResult.ok("核保成功");
 
         } catch (SystemException systemException) {
             // 下发修改
-            QueryOrderDetailRequest queryOrderDetailRequest = new QueryOrderDetailRequest(insAreaCompany.getInsOrderNo());
-            QueryOrderStateResponse queryOrderStateResponse = zijinRequestApiComponents.queryOrderDetail(queryOrderDetailRequest, httpHeaders);
+            QueryOrderDetailRequest queryOrderDetailRequest =
+                    new QueryOrderDetailRequest(insAreaCompany.getInsOrderNo());
+            QueryOrderStateResponse queryOrderStateResponse =
+                    zijinRequestApiComponents.queryOrderDetail(queryOrderDetailRequest, httpHeaders);
             String uwFlag = queryOrderStateResponse.getUwFlag();
             if (OrderStatusEnum.O_3.getCode().equals(uwFlag)) {
                 insAreaCompany.setOrderstatus(InsOrderStatusEnum.TO_BACK.getCode());
@@ -244,15 +282,20 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         for (InsTaskImagesBase64 insTaskImagesBase64 : insTaskImagesBase64s) {
             UploadFileRequest uploadImageRequest = new UploadFileRequest(insTaskImagesBase64, insAreaCompany.getId());
             // 文件上传
-            UploadFileResponse uploadFileResponse = zijinRequestApiComponents.uploadFile(uploadImageRequest, httpHeaders);
+            UploadFileResponse uploadFileResponse = zijinRequestApiComponents.uploadFile(uploadImageRequest,
+                    httpHeaders);
             // 文件信息与订单关联 itemFileDataList
-            UploadImageInfoListRequest.ItemFileDataListDTO itemFileDataListDTO = new UploadImageInfoListRequest.ItemFileDataListDTO(uploadImageRequest, uploadFileResponse.getFileId());
+            UploadImageInfoListRequest.ItemFileDataListDTO itemFileDataListDTO =
+                    new UploadImageInfoListRequest.ItemFileDataListDTO(uploadImageRequest,
+                            uploadFileResponse.getFileId());
             itemFileDataListDTOS.add(itemFileDataListDTO);
         }
 
         // 文件信息与订单关联
-        UploadImageInfoListRequest uploadImageInfoListRequest = new UploadImageInfoListRequest(itemFileDataListDTOS, insAreaCompany.getInsOrderNo());
-        BaseResponse baseResponse = zijinRequestApiComponents.uploadImageInfoList(uploadImageInfoListRequest, httpHeaders);
+        UploadImageInfoListRequest uploadImageInfoListRequest = new UploadImageInfoListRequest(itemFileDataListDTOS,
+                insAreaCompany.getInsOrderNo());
+        BaseResponse baseResponse = zijinRequestApiComponents.uploadImageInfoList(uploadImageInfoListRequest,
+                httpHeaders);
 
         return HttpResult.ok(baseResponse.getRtnMsg());
     }
@@ -319,7 +362,8 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
 
         // 2 请求查看订单状态
         OrderNoRequest orderNoRequest = new OrderNoRequest(insAreaCompany.getId());
-        QueryOrderDetailResponse queryOrderDetailResponse = zijinRequestApiComponents.getOrderDetail(orderNoRequest, httpHeaders);
+        QueryOrderDetailResponse queryOrderDetailResponse = zijinRequestApiComponents.getOrderDetail(orderNoRequest,
+                httpHeaders);
         String orderStatus = queryOrderDetailResponse.getResultObj().getOrderStatus();
 
         if (OrderStatusEnum.O_4.getCode().equals(orderStatus)) {
@@ -373,7 +417,8 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         return null;
     }
 
-    public QuoteRespVo getQuoteRespVo(CalculatePremiumResponse calculatePremiumResponse, BaseQuoteInfoVo yaQuoteInfoVo, List<ZjQuoteAccidentVo> accidentalDrivingVo) {
+    public QuoteRespVo getQuoteRespVo(CalculatePremiumResponse calculatePremiumResponse,
+                                      BaseQuoteInfoVo yaQuoteInfoVo, List<ZjQuoteAccidentVo> accidentalDrivingVo) {
         double jqPremium = 0;
         double syPremium = 0;
         double sumPayTax = 0;
@@ -397,11 +442,9 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
                     break;
             }
         }
-
         // 交强
         quoteRespVo.setStartDateJq(calculatePremiumResponse.getBasePart().getJqStartTime());
         quoteRespVo.setEndDateJq(calculatePremiumResponse.getBasePart().getJqEndTime());
-
         // 商业
         quoteRespVo.setStartDateSy(calculatePremiumResponse.getBasePart().getSyStartTime());
         quoteRespVo.setEndDateSy(calculatePremiumResponse.getBasePart().getSyEndTime());
@@ -414,16 +457,19 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         QuoteKindRespVo kind;
         List<CalculatePremiumResponse.ItemKindListDTO> itemKindList = calculatePremiumResponse.getItemKindList();
 
+        // 商业险险种
         List<KindInfoVo> kindList = yaQuoteInfoVo.getKindList();
         for (KindInfoVo kindInfoVo : kindList) {
             kind = new QuoteKindRespVo();
             kind.setKindCode(kindInfoVo.getKindCode());
             kind.setKindName(kindInfoVo.getKindName());
-            kind.setAmount(kindInfoVo.getAmount());
             int i = ArrayUtil.indexOf(InsuranceTypeCorrespondence.getJinZhangGuiType(), kindInfoVo.getKindCode());
 
-            CalculatePremiumResponse.ItemKindListDTO itemKindListDTO = itemKindList.stream().filter(a -> a.getKindCode().equals(InsuranceTypeCorrespondence.getZjConnectInsuranceType()[i])).collect(Collectors.toList()).get(0);
+            CalculatePremiumResponse.ItemKindListDTO itemKindListDTO = itemKindList.stream()
+                    .filter(a -> a.getKindCode().equals(InsuranceTypeCorrespondence.getZjConnectInsuranceType()[i]))
+                    .collect(Collectors.toList()).get(0);
 
+            kind.setAmount(Double.parseDouble(itemKindListDTO.getAmount()));
             kind.setCoveragePremium(Double.parseDouble(itemKindListDTO.getPremium()));
             kind.setUnitAmount(kindInfoVo.getUnitAmount());
             if (!ObjectUtils.isEmpty(kindInfoVo.getDeductibleRate())) {
@@ -433,10 +479,13 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         }
 
         // 驾意险
-        List<CalculatePremiumResponse.CarPolicySubInfoListDTO> carPolicySubInfoList = calculatePremiumResponse.getCarPolicySubInfoList();
+        List<CalculatePremiumResponse.CarPolicySubInfoListDTO> carPolicySubInfoList =
+                calculatePremiumResponse.getCarPolicySubInfoList();
 
         if (carPolicySubInfoList != null && !carPolicySubInfoList.isEmpty()) {
-            List<AccidentResponseVo> accidentResponseVos = CalculatePremiumResponse.CarPolicySubInfoListDTO.toAccidentResponseVoList(carPolicySubInfoList, accidentalDrivingVo);
+            List<AccidentResponseVo> accidentResponseVos =
+                    CalculatePremiumResponse.CarPolicySubInfoListDTO.toAccidentResponseVoList(carPolicySubInfoList,
+                            accidentalDrivingVo);
             quoteRespVo.setAccident(accidentResponseVos);
             // 驾意险价格
             BigDecimal bigDecimal = CalculatePremiumResponse.CarPolicySubInfoListDTO.sumPremium(carPolicySubInfoList);
@@ -452,12 +501,14 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         quoteRespVo.setCiSumPermium(CalculateUtils.add(jqPremium, sumPayTax));//交强险和车船税合计
         quoteRespVo.setSumPermium(CalculateUtils.add(jqPremium, syPremium, sumPayTax, jyPremium));//保费合计
         quoteRespVo.setTotalAdjustRate(0);
-//        quoteRespVo.setILogPreUdwMess("");//评分
         quoteRespVo.setOrderno(yaQuoteInfoVo.getOrderNo()); //订单号
         return quoteRespVo;
     }
 
-    public HttpResult<QuoteRespVo> responseOrder(CalculatePremiumResponse calculatePremiumResponse, QuoteRespVo quoteRespVo, PtlAgreementAttribution ptlAgreementAttribution, String orderId, String orderNo) {
+    public HttpResult<QuoteRespVo> responseOrder(CalculatePremiumResponse calculatePremiumResponse,
+                                                 QuoteRespVo quoteRespVo,
+                                                 PtlAgreementAttribution ptlAgreementAttribution, String orderId,
+                                                 String orderNo) {
         // 保存订单信息
         InsAreaCompany insAreaCompany = new InsAreaCompany(quoteRespVo, ptlAgreementAttribution);
         // 协议id
@@ -469,7 +520,8 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         quoteRespVo.setCompanyId(orderNo);
         // 车船税
         CalculatePremiumResponse.CarShipTaxDTO carShipTax = calculatePremiumResponse.getCarShipTax();
-        TaxArrears taxArrears = new TaxArrears("往年欠税", Double.parseDouble(carShipTax.getPreviousPay()), Double.parseDouble(carShipTax.getLateFee()));
+        TaxArrears taxArrears = new TaxArrears("往年欠税", Double.parseDouble(carShipTax.getPreviousPay()),
+                Double.parseDouble(carShipTax.getLateFee()));
         List<TaxArrears> taxArrearsList = Collections.singletonList(taxArrears);
         insAreaCompany.setTaxArrears(JSON.parseArray(JSON.toJSONString(taxArrearsList)));