1.添加非车保单查看报错 请核实证件号和保单号是否正确

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

@@ -243,7 +243,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
             // 此处返回的  flowid  4.1．续保确认  4.2．车辆信息确认  001 平安车型搜索接口  需要使用
             String flowid = indexResponse.getFlowid();
 
-           // carInfo.setModelcname("欧雅OCTAVIA 2.0L轿车");
+            // carInfo.setModelcname("欧雅OCTAVIA 2.0L轿车");
 
             // 2. 车型查询
             SearchPAVehicleListRequest searchPAVehicleListRequest = new SearchPAVehicleListRequest(parameters.getUserId(), flowid,
@@ -701,7 +701,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                     list.add(forceApplyNo);
                 }
                 if (StringUtils.isNotBlank(accidentApplyNo)) {
-                   // list.add(accidentApplyNo);
+                    // list.add(accidentApplyNo);
                 }
                 pinganApiLog.setId(null);
                 DocumentStatusListRequest documentStatusListRequest = new DocumentStatusListRequest(list, parameters);
@@ -870,7 +870,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
         String fileBZName="";
         //驾意险
         if(type==3){
-           // flag="true";
+             flag="true";
             fileName="_非车险保单";
         }else if(type==1){
             //交强
@@ -1282,8 +1282,8 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
             PingAnConfigureParameters parameters = configureParametersComponents.toEntity(PingAnConfigureParameters.class,
                     ptlAgreementAttribution);
             ArrayList<String>  list =new ArrayList<>();
-            String bizApplyNo = insAreaCompany.getJqapplyno();
-            String forceApplyNo =insAreaCompany.getSyapplyno();
+            String forceApplyNo = insAreaCompany.getJqapplyno();
+            String  bizApplyNo=insAreaCompany.getSyapplyno();
             JSONArray crossInsurance = insAreaCompany.getCrossInsurance();
             //非车投保单号
             String accidentApplyNo = null;
@@ -1297,8 +1297,9 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                 list.add(forceApplyNo);
             }
             if (StringUtils.isNotBlank(accidentApplyNo)) {
-               // list.add(accidentApplyNo);
+                //  list.add(accidentApplyNo);
             }
+
             pinganApiLog.setId(null);
             DocumentStatusListRequest documentStatusListRequest = new DocumentStatusListRequest(list, parameters);
             DocumentStatusListResponse documentStatusListResponse = null;
@@ -1310,7 +1311,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
             if (documentStatusListResponse != null && "0".equals(documentStatusListResponse.getResultCode())) {
                 ArrayList<DocumentStatusListResponse.DocumentDTO> documentList = documentStatusListResponse.getDocumentList();
                 Boolean jqflag = false;
-                Boolean sqflag = false;
+                Boolean syflag = false;
                 Boolean fcflag = false;
                 String status="";
                 String jqPlicyNo=null;
@@ -1320,17 +1321,24 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                     //B2 为 未缴费
                     for (DocumentStatusListResponse.DocumentDTO dto : documentList) {
                         status =dto.getStatus();
-                        if (OrderStatusCodeEnum.ORDER_STATUS_CODE_B2.getCode().equals(dto.getStatus()) && StringUtils.isNotBlank(bizApplyNo) && bizApplyNo.equals(dto.getApplyNo() == null ? "" : dto.getApplyNo())) {
-                            jqPlicyNo=dto.getPolicyNo();
-                            sqflag = true;
+                        if (StringUtils.isNotBlank(bizApplyNo) && bizApplyNo.equals(dto.getApplyNo() == null ? "" : dto.getApplyNo())) {
+                            syPlicyNo=dto.getPolicyNo();
+                            syflag = true;
                         }
-                        if (OrderStatusCodeEnum.ORDER_STATUS_CODE_B2.getCode().equals(dto.getStatus()) && StringUtils.isNotBlank(forceApplyNo) && forceApplyNo.equals(dto.getApplyNo() == null ? "" : dto.getApplyNo())) {
+                        if (StringUtils.isNotBlank(forceApplyNo) && forceApplyNo.equals(dto.getApplyNo() == null ? "" : dto.getApplyNo())) {
                             jqflag = true;
-                            syPlicyNo=dto.getPolicyNo();
+                            jqPlicyNo=dto.getPolicyNo();
+                        }
+                        List<DocumentStatusListResponse.DocumentDTO.UnAutoListInfoDTO> unAutoListInfo = dto.getUnAutoListInfo();
+                        String applyNo=null;
+                        String policyNo=null;
+                        if(unAutoListInfo!=null && unAutoListInfo.size()>0){
+                            applyNo = unAutoListInfo.get(0).getApplyNo();
+                            policyNo = unAutoListInfo.get(0).getPolicyNo();
                         }
-                        if (OrderStatusCodeEnum.ORDER_STATUS_CODE_B2.getCode().equals(dto.getStatus()) && StringUtils.isNotBlank(accidentApplyNo) && accidentApplyNo.equals(dto.getApplyNo() == null ? "" : dto.getApplyNo())) {
+                        if (StringUtils.isNotBlank(accidentApplyNo) && accidentApplyNo.equals(applyNo == null ? "" : applyNo)) {
                             fcflag = true;
-                            jyPlicyNo=dto.getPolicyNo();
+                            jyPlicyNo=policyNo;
                         }
                     }
                 }
@@ -1338,7 +1346,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                     insAreaCompany.setJqapplyno(forceApplyNo);
                     insAreaCompany.setJqpolicyno(jqPlicyNo);
                 }
-                if (sqflag) {
+                if (syflag) {
                     insAreaCompany.setSyapplyno(bizApplyNo);
                     insAreaCompany.setSypolicyno(syPlicyNo);
                 }
@@ -1352,14 +1360,17 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                     JSONArray objects = JSON.parseArray(JSON.toJSONString(jyList));
                     insAreaCompany.setCrossInsurance(objects);
                 }
-                if(InsOrderStatusEnum.WAIT_PAY.getCode().equals(status) && ("0".equals(insAreaCompany.getOrderstatus()) || "1".equals(insAreaCompany.getOrderstatus()) )){
+                logger.info(documentStatusListResponse.toString()+"调用状态查询接口");
+                if(OrderStatusCodeEnum.ORDER_STATUS_CODE_B2.getCode().equals(status) && ("0".equals(insAreaCompany.getOrderstatus()) || "1".equals(insAreaCompany.getOrderstatus()) )){
                     //说明核保成功，更新大订单和小订单的状态为1  更新为已核保待缴费
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode() );
                     insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
-                }else if(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(status) && ("0".equals(insAreaCompany.getOrderstatus()) || "1".equals(insAreaCompany.getOrderstatus()) || "2".equals(insAreaCompany.getOrderstatus()))) {
+                }else if(OrderStatusCodeEnum.ORDER_STATUS_CODE_B5.getCode().equals(status) && ("0".equals(insAreaCompany.getOrderstatus()) || "1".equals(insAreaCompany.getOrderstatus()) || "2".equals(insAreaCompany.getOrderstatus()))) {
                     //承保
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
+                    insAreaCompany.setPayDate(LocalDateTime.now());
                     insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
+                    logger.info(insAreaCompany.toString()+"更新为承保状态！！！");
                 }
             }
             return HttpResult.ok(documentStatusListResponse);
@@ -1390,7 +1401,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
             list.add(forceApplyNo);
         }
         if (StringUtils.isNotBlank(accidentApplyNo)) {
-           // list.add(accidentApplyNo);
+            // list.add(accidentApplyNo);
         }
         return  list;
     }
@@ -1904,7 +1915,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                 list.add(forceApplyNo);
             }
             if (StringUtils.isNotBlank(accidentApplyNo)) {
-              //  list.add(accidentApplyNo);
+                //  list.add(accidentApplyNo);
             }
 
             pinganApiLog.setId(null);