修改紫金上传影像逻辑

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

@@ -89,16 +89,14 @@ 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());
     }
 
@@ -110,8 +108,8 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         // 1.1 账号信息
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(agreementId);
         // 1.2 通过 协议id获取配置实体
-        ZjConfigureParameters zjConfigureParameters =
-                configureParametersComponents.toEntity(ZjConfigureParameters.class, ptlAgreementAttribution);
+        ZjConfigureParameters zjConfigureParameters = configureParametersComponents.toEntity(ZjConfigureParameters.class,
+                ptlAgreementAttribution);
         HttpHeaders httpHeaders = zijinRequestApiComponents.getHttpHeaders(zjConfigureParameters,
                 ZijinRequestApiComponents.RECURSIVE_HIERARCHY);
         // 2. 查询车型
@@ -131,40 +129,33 @@ 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);
+        CalculatePremiumRequest calculatePremiumRequest = new CalculatePremiumRequest(quoteInfoVo, vehicleModelInfosDTO,
+                queryActualValueResponse.getActualValue(), quoteVo.getAccidentalDrivingVo(), zjConfigureParameters, modelQueryResponse);
         boolean isEnergy = false;
         if ("D6,D8,D12,".contains(vehicleModelInfosDTO.getPowerTypeCode() + ",")) {//纯电动 燃料电池 插电式混合动力 归属为新能源产品
             isEnergy = true;
         }
         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(), isEnergy);
+        QuoteRespVo quoteRespVo = getQuoteRespVo(calculatePremiumResponse, quoteInfoVo, quoteVo.getAccidentalDrivingVo(), isEnergy);
         if (!StringUtils.isEmpty(message)) {
             ArrayList<String> objects = new ArrayList<>();
             objects.add(message);
             quoteRespVo.setWarnMessageList(objects);
         }
-        return responseOrder(calculatePremiumResponse, quoteRespVo, ptlAgreementAttribution,
-                calculatePremiumRequest.getOrderId(), calculatePremiumRequest.getOrderNo(), quoteInfoVo);
+        return responseOrder(calculatePremiumResponse, quoteRespVo, ptlAgreementAttribution, calculatePremiumRequest.getOrderId(),
+                calculatePremiumRequest.getOrderNo(), quoteInfoVo);
     }
 
     @Override
@@ -179,15 +170,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);
@@ -200,21 +191,19 @@ 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);
+        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());
@@ -224,21 +213,19 @@ 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());
@@ -262,7 +249,8 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         HttpHeaders httpHeaders = zijinRequestApiComponents.getHttpHeaders(insAreaCompany.getAgreementId());
         InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
 
-        List<InsTaskImagesBase64> insTaskImagesBase64s = insTaskImagesService.findByOrderNo(insOrders.getOrderno(), insAreaCompany.getId());
+        List<InsTaskImagesBase64> insTaskImagesBase64s = insTaskImagesService.findByOrderNo(insOrders.getOrderno(),
+                insAreaCompany.getId(), true);
         if (insTaskImagesBase64s.isEmpty()) {
             return HttpResult.ok();
         }
@@ -273,20 +261,17 @@ 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());
+                    new UploadImageInfoListRequest.ItemFileDataListDTO(uploadImageRequest, uploadFileResponse.getFileId());
             itemFileDataListDTOS.add(itemFileDataListDTO);
         }
 
         // 文件信息与订单关联
         UploadImageInfoListRequest uploadImageInfoListRequest = new UploadImageInfoListRequest(itemFileDataListDTOS,
                 insAreaCompany.getInsOrderNo());
-        BaseResponse baseResponse = zijinRequestApiComponents.uploadImageInfoList(uploadImageInfoListRequest,
-                httpHeaders);
+        BaseResponse baseResponse = zijinRequestApiComponents.uploadImageInfoList(uploadImageInfoListRequest, httpHeaders);
         return HttpResult.ok(baseResponse.getRtnMsg());
     }
 
@@ -352,8 +337,7 @@ 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();
 
         // 3. 订单生效以后修改状态
@@ -408,8 +392,8 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         return null;
     }
 
-    public QuoteRespVo getQuoteRespVo(CalculatePremiumResponse calculatePremiumResponse,
-                                      BaseQuoteInfoVo yaQuoteInfoVo, List<ZjQuoteAccidentVo> accidentalDrivingVo, boolean isEnergy) {
+    public QuoteRespVo getQuoteRespVo(CalculatePremiumResponse calculatePremiumResponse, BaseQuoteInfoVo yaQuoteInfoVo,
+                                      List<ZjQuoteAccidentVo> accidentalDrivingVo, boolean isEnergy) {
         double jqPremium = 0;
         double syPremium = 0;
         double sumPayTax = 0;
@@ -466,13 +450,11 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             int i = ArrayUtil.indexOf(InsuranceTypeCorrespondence.getJinZhangGuiType(), kindInfoVo.getKindCode());
             CalculatePremiumResponse.ItemKindListDTO itemKindListDTO;
             if (isEnergy) {
-                itemKindListDTO = itemKindList.stream()
-                        .filter(a -> a.getKindCode().equals(InsuranceTypeCorrespondence.getZjConnectInsuranceTypeNewEnergy()[i]))
-                        .collect(Collectors.toList()).get(0);
+                itemKindListDTO =
+                        itemKindList.stream().filter(a -> a.getKindCode().equals(InsuranceTypeCorrespondence.getZjConnectInsuranceTypeNewEnergy()[i])).collect(Collectors.toList()).get(0);
             } else {
-                itemKindListDTO = itemKindList.stream()
-                        .filter(a -> a.getKindCode().equals(InsuranceTypeCorrespondence.getZjConnectInsuranceType()[i]))
-                        .collect(Collectors.toList()).get(0);
+                itemKindListDTO =
+                        itemKindList.stream().filter(a -> a.getKindCode().equals(InsuranceTypeCorrespondence.getZjConnectInsuranceType()[i])).collect(Collectors.toList()).get(0);
             }
 
             kind.setAmount(Double.parseDouble(itemKindListDTO.getAmount()));
@@ -486,13 +468,11 @@ 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);
+                    CalculatePremiumResponse.CarPolicySubInfoListDTO.toAccidentResponseVoList(carPolicySubInfoList, accidentalDrivingVo);
             quoteRespVo.setAccident(accidentResponseVos);
             // 驾意险价格
             BigDecimal bigDecimal = CalculatePremiumResponse.CarPolicySubInfoListDTO.sumPremium(carPolicySubInfoList);
@@ -513,10 +493,9 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         return quoteRespVo;
     }
 
-    public HttpResult<QuoteRespVo> responseOrder(CalculatePremiumResponse calculatePremiumResponse,
-                                                 QuoteRespVo quoteRespVo,
-                                                 PtlAgreementAttribution ptlAgreementAttribution, String orderId,
-                                                 String orderNo, BaseQuoteInfoVo quoteInfoVo) {
+    public HttpResult<QuoteRespVo> responseOrder(CalculatePremiumResponse calculatePremiumResponse, QuoteRespVo quoteRespVo,
+                                                 PtlAgreementAttribution ptlAgreementAttribution, String orderId, String orderNo,
+                                                 BaseQuoteInfoVo quoteInfoVo) {
         // 保存订单信息
         InsAreaCompany insAreaCompany = new InsAreaCompany(quoteRespVo, ptlAgreementAttribution);
         // 协议id