Merge branch 'test' of http://www.baoxianzhanggui.com:8090/sxzgd/java-insagent-pc into test

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

@@ -79,10 +79,10 @@ public class HuaTaiOrderApiController {
         return this.huaTaiOrderApiService.auditStatusQuery(companyId);
     }
 
-    @PostMapping("/getPaymentUrl")
-    @ApiOperation(value = "支付码获取")//3.8.	电子投保单确认及缴费短信发送接口
+/*    @PostMapping("/getPaymentUrl")
+    @ApiOperation(value = "支付码获取")//3.8.	电子投保单确认及缴费短信发送接口    都为后端自动触发调用 前端不触发 暂时注释
     public HttpResult<Object> getPaymentUrl(@RequestSingleParam(value = "companyId") String companyId) {
         return this.huaTaiOrderApiService.getPaymentUrl(companyId);
-    }
+    }*/
 
 }

src/main/java/com/ydtech/modules/order/entity/api/huatai/request/HuaTaiInsurancePolicyPrintRequest.java

@@ -23,8 +23,8 @@ public class HuaTaiInsurancePolicyPrintRequest extends HuaTaiBaseRequest {
         super.getHead().setTransCode(HuaTaiTransCode.INSURANCE_POLICY_PRINT);
     }
 
-    //报价单号
+    //保单号
     @JsonProperty("businessNo")
-    private List<String> businessNo;
+    private String businessNo;
 
 }

src/main/java/com/ydtech/modules/order/entity/api/huatai/response/HuaTaiInsurancePolicyPrintResponse.java

@@ -1,10 +1,13 @@
 package com.ydtech.modules.order.entity.api.huatai.response;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.order.entity.api.huatai.HuaTaiBaseResponse;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @Data
@@ -12,5 +15,12 @@ public class HuaTaiInsurancePolicyPrintResponse extends HuaTaiBaseResponse {
 
     private static final long serialVersionUID = -2403785562994746282L;
 
+    //保批单登记结果
+    @JsonProperty("registResult")
+    private String registResult;
+
+    //下载地址（列表）
+    @JsonProperty("registResult")
+     private List<String> elecDownLoadResultList;
 
 }

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

@@ -42,11 +42,11 @@ public interface HuaTaiOrderApiService extends BaseOrderService<AccidentalDrivin
      */
     HttpResult<Object> auditStatusQuery(String companyId);
 
-    /**
+/*    *//**
      * 获取支付链接（电子投保单确认及缴费短信发送接口）
      * @param companyId
      * @return
-     */
-    HttpResult<Object> getPaymentUrl(String companyId);
+     *//*
+    HttpResult<Object> getPaymentUrl(String companyId);*/
 
 }

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

@@ -285,11 +285,11 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
     }
 
 
-    /**
+ /*   *//**
      * 缴费查询
      * @param companyId 子订单号
      * @return
-     */
+     *//*
     @Override
     public HttpResult<Object> getPaymentUrl(String companyId) {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByInsOrderNo(companyId);
@@ -301,12 +301,17 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
             return HttpResult.ok(InsOrderStatusEnum.ACCEPT_INSURANCE.getDesc());
         }
 
-        // 2. 组装请求体
-        HuaTaiPaymentUrlRequest orderStatusRequest = new HuaTaiPaymentUrlRequest();
-        orderStatusRequest.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
-        HuaTaiPaymentUrlResponse orderStatusResponse = huaTaiRequestApiComponents.getPaymentUrl(orderStatusRequest, HuaTaiPaymentUrlResponse.class);
-        return HttpResult.ok("");
-    }
+        // 2. 组装请求体  调用缴费接口获取缴费链接
+        HuaTaiPaymentUrlRequest huaTaiPaymentUrlRequest = new HuaTaiPaymentUrlRequest(insAreaCompany,huaTaiConfigureParameters);
+        huaTaiPaymentUrlRequest.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
+        HuaTaiPaymentUrlResponse paymentUrlResponse = huaTaiRequestApiComponents.getPaymentUrl(huaTaiPaymentUrlRequest, HuaTaiPaymentUrlResponse.class);
+        if(StringUtils.isNotEmpty(paymentUrlResponse.getPayUrl())){
+            insAreaCompany.setPaymentLink(paymentUrlResponse.getPayUrl());
+        }
+        insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
+        insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
+        return HttpResult.ok("核保成功");
+    }*/
 
     /**
      *电子保单下载接口
@@ -319,10 +324,45 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         // 1. 协议id获取配置实体
         HuaTaiConfigureParameters huaTaiConfigureParameters = configureParametersComponents.toEntity(HuaTaiConfigureParameters.class, insAreaCompany.getAgreementId());
         InsOrders order = insOrdersService.getById(insAreaCompany.getOrderno());
+        String policyNo;
+        String riskCode = policyPrintVo.getRiskCode();
+        if (InsuranceRisk.TRAFFIC.getCode().equals(riskCode)) {
+            policyNo = insAreaCompany.getJqpolicyno();
+        } else if (InsuranceRisk.BUSINESS.getCode().equals(riskCode)) {
+            policyNo = insAreaCompany.getJqpolicyno();
+        } else {
+            throw new SystemException("险种代码不存在");
+        }
 
         // 2. 组装请求体
         HuaTaiInsurancePolicyPrintRequest request = new HuaTaiInsurancePolicyPrintRequest();
+        request.setBusinessNo(policyNo);
         HuaTaiInsurancePolicyPrintResponse response = huaTaiRequestApiComponents.insurancePolicyPrint(request, HuaTaiInsurancePolicyPrintResponse.class);
+        if("0000".equals(response.getRegistResult())){
+            List<String> urlList = response.getElecDownLoadResultList();
+            //接口文档与返回示例不一致，待联调后修改
+
+
+          /*  if(urlList!=null && !urlList.isEmpty()){
+               String url = urlList.get(0);
+               String templateName = "";
+               if("DZ_AJ".equals(code)){
+                   templateName = "-交强险标志.pdf";
+               }else if("DZ_AE".equals(code)){
+                   if("0330".equals(request.getRiskCode())){
+                       templateName = "-交强险保单.pdf";
+                   }else {
+                       templateName = "-商业险保单.pdf";
+                   }
+               }
+                String transferUrl = gainCarInsPolicy(url, licensePlate + templateName, licensePlate);
+                List<String> transferUrlList = new ArrayList<>();
+                transferUrlList.add(transferUrl);
+                response.setDownloadUrl(transferUrlList);
+            }*/
+        }else{
+            return HttpResult.error("获取华泰电子保单失败："+response.getRegistResult());
+        }
         return HttpResult.ok("下载成功"/*, response.getDownloadUrl()*/);
     }