提交修改更新承保状态和支付时间删除无用代码

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

@@ -949,47 +949,10 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
             ODR2010Response odr2010Response = daJiaRequestApiComponents.verifyPayment(odr2010Request);
             if (odr2010Response.getStatus().equals(Message.M0000.getCode())) {
                 List<ODR2010Response.ResultDTO> result = odr2010Response.getResult();
-                //是否人工核保
-                if (checkArtificial(result)) {
-                    //是否存在核保退回
-                    if (checkBack(result)) {
-                       // insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
-                       // insAreaCompanyService.updateById(insAreaCompany);
-                    } else
-                        //存在 核保通过 并且 不存在支付连接 则 生成支付连接
-                        if (!checkPayLink(result, insAreaCompany)) {
-                            //核保成功  获取支付二维码
-                            //驾意险 返回数据
-                           // List<NVHLODR1001Response.policyInfosDTO> policyInfosDTOS = null;
-                           // if (!Objects.isNull(insAreaCompany.getCrossInsurance())) {
-                           //     policyInfosDTOS = JSON.parseArray(JSON.toJSONString(insAreaCompany.getCrossInsurance()),
-                           //             NVHLODR1001Response.policyInfosDTO.class);
-                           // }
-                            //ODR1011Request odr1011Request = new ODR1011Request(insAreaCompany.getInsOrderNo(), daJiaConfigureParameters,
-                            //        policyInfosDTOS);
-                           // ODR1011Response payNo = daJiaRequestApiComponents.getPayNo(odr1011Request);
-                           // if (payNo.getStatus().equals(Message.M0000.getCode())) {
-                                //获取支付二维码成功  保存支付二维码
-                             //   insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
-                             //   insAreaCompany.setPaymentLink(payNo.getResult().getSignInfoUrl());
-                             //   insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
-                           // } else {
-                               // return HttpResult.error("获取支付二维码失败");
-                           // }
-                        }
-                }
                 //是否存在保单生成
                 if (checkBdGen(result) && !"3".equals(insAreaCompany.getOrderstatus())) {
                     List<ODR2010Response.ResultDTO> collect =
                             result.stream().filter(x -> x.getNotifyType().equals("2009")).collect(Collectors.toList());
-
-                    //如果交强和商业都不为空
-                    if (insAreaCompany.getJqapplyno() != null && insAreaCompany.getSyapplyno() != null) {
-                        if (collect.size() < 2) {
-                          //  return HttpResult.ok("查询订单状态成功");
-                        }
-                    }
-
                     for (int i = 0, length = collect.size(); i < length; i++) {
                         //交强或商业 的 保单号
                         if (collect.get(i).getProdNo().equals(CProdNo.JQ.getCode())) {
@@ -1005,14 +968,17 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
                         LocalDateTime parse = LocalDateTime.parse(collect.get(i).getIssueTm(), formatter);
                         insAreaCompany.setPayDate(parse);
                     }
+                    //设置支付时间
+                    if(insAreaCompany.getPayDate()==null){
+                        insAreaCompany.setPayDate(LocalDateTime.now());
+                    }
                     //更新订单状态
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
                     insAreaCompanyService.updateCompanyAndOrdersNew(insAreaCompany);
                 }
             }
-           // return HttpResult.ok("查询订单状态成功");
         } catch (Exception e) {
-           // throw new RuntimeException(e.getMessage());
+            throw new RuntimeException(e.getMessage());
         }
     }
 }

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

@@ -1109,31 +1109,6 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
             InsOrderStatusResp.DataDTO syDataDTO =
                     iosr.getData().stream().filter(b -> b.getProposalNo().equals(iac.getSyapplyno())).findFirst().orElse(null);
 
-            //待核保订单处理
-            /**
-            if (iac.getOrderstatus().equals(InsOrderStatusEnum.WAIT_AUDIT.getCode())) {
-                //单交
-                boolean jqBoo = null != jqDataDTO && null == syDataDTO && jqDataDTO.getUnderwriteFlag().equals("1");
-                //单商
-                boolean syBoo = null != syDataDTO && null == jqDataDTO && syDataDTO.getUnderwriteFlag().equals("1");
-                //交商
-                boolean jqSyBoo =
-                        null != syDataDTO && null != jqDataDTO && syDataDTO.getUnderwriteFlag().equals("1") && jqDataDTO.getUnderwriteFlag().equals("1");
-                if (jqBoo || syBoo || jqSyBoo) {
-                    iac.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
-                    更新支付链接
-                    SignatureResponse signature = guorenRequestApiComponent.signature(iac);
-                    iac.setPaymentLink(signature.getQrCode());
-
-                    insAreaCompanyService.updateCompanyAndOrdersNew(iac);
-                    return HttpResult.ok();
-                } else {
-                    //return HttpResult.ok("核保状态未更新");
-                }
-
-            }
-            **/
-
             boolean updateFlag = false;
             if (null != jqDataDTO && StringUtils.isNotEmpty(jqDataDTO.getPolicyNo())) {
                 iac.setJqpolicyno(jqDataDTO.getPolicyNo());
@@ -1153,9 +1128,6 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
                 iac.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
                 guorenRequestApiComponent.queryNoCarPolicyNo(iac);
                 insAreaCompanyService.updateCompanyAndOrdersNew(iac);
-               // return HttpResult.ok("订单已支付，订单状态修改完成");
-            } else {
-               // return HttpResult.error("订单还未支付哦");
             }
         }
     }

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

@@ -745,10 +745,6 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         HuaTaiConfigureParameters huaTaiConfigureParameters = configureParametersComponents.toEntity(HuaTaiConfigureParameters.class,
                 insAreaCompany.getAgreementId());
 
-        if (insAreaCompany.getOrderstatus().equals(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode())) {
-           //  return HttpResult.ok(InsOrderStatusEnum.ACCEPT_INSURANCE.getDesc());
-            return;
-        }
         // 2. 组装请求体
         HuaTaiOrderStatusRequest orderStatusRequest = new HuaTaiOrderStatusRequest(insAreaCompany, huaTaiConfigureParameters);
         orderStatusRequest.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
@@ -757,8 +753,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
 
         boolean jqExistFlag = false;
         boolean syExistFlag = false;
-        String jqFailReason = "";
-        String syFailReason = "";
+
         List<HuaTaiOrderStatusResponse.PayDetaiDto> payDetaiList = orderStatusResponse.getPayDetaiList();
         for (HuaTaiOrderStatusResponse.PayDetaiDto payDetai : payDetaiList) {
             //交强保单号存值
@@ -766,8 +761,6 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
                 if ("1".equals(payDetai.getPOLICYSTATUS())) {
                     jqExistFlag = true;
                     insAreaCompany.setJqpolicyno(payDetai.getPOLICYNO());
-                } else {
-                    jqFailReason = payDetai.getFAILREASON();
                 }
             }
             //商业保单号存值
@@ -775,8 +768,6 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
                 if ("1".equals(payDetai.getPOLICYSTATUS())) {
                     syExistFlag = true;
                     insAreaCompany.setSypolicyno(payDetai.getPOLICYNO());
-                } else {
-                    syFailReason = payDetai.getFAILREASON();
                 }
             }
         }
@@ -788,13 +779,6 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
             }
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
             insAreaCompanyService.updateCompanyAndOrdersNew(insAreaCompany);
-           // return HttpResult.ok("保单生成成功");
-        } else {
-            if (StringUtils.isNotEmpty(jqFailReason) || StringUtils.isNotEmpty(syFailReason)) {
-              //  return HttpResult.error("保单生成失败，原因为：" + jqFailReason + syFailReason);
-            } else {
-              //  return HttpResult.error("保单生成失败，华泰返回异常，请联系管理员排查！");
-            }
         }
     }
 }

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

@@ -447,9 +447,6 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
             insAreaCompany.setCrossInsurance(JSON.parseArray(JSON.toJSONString(drivingInsurances)));
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());//已承保
             insAreaCompanyService.updateCompanyAndOrdersNew(insAreaCompany);
-           // return HttpResult.ok("支付成功");
         }
-
-       // throw new SystemException("此订单还未缴费");
     }
 }

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

@@ -1370,12 +1370,6 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
         InsAreaCompany iac = insAreaCompanyService.getById(insAreaCompanyId);
         InsOrders order = insOrdersService.getById(iac.getOrderno());
-        //AssertionUtils.isEmpty(iac, "报价订单不存在");
-
-        if (StringUtils.isEmpty(iac.getAgreementId())) {
-           // return HttpResult.error("协议号空");
-        }
-
         // 获取协议配置信息
         YcConfigureParameters ycConfigureParameters = gainYcConfigParams(iac.getAgreementId());
 
@@ -1392,61 +1386,22 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
             //成功
             if (param.getResult().equals("0")) {
-
                 if (iac.getOrderstatus().equals(InsOrderStatusEnum.WAIT_PAY.getCode())) {
-                    /**
-                    buildCallBackStatus(iac, param.getJqstatus());
-                    if (StringUtils.isNotEmpty(param.getBizPolicyNo())) {
-                        iac.setSypolicyno(param.getBizPolicyNo());
-                    }
-
-                    if (StringUtils.isNotEmpty(param.getCiPolicyNo())) {
-                        iac.setJqpolicyno(param.getCiPolicyNo());
-                    }
-
-                    if (StringUtils.isNotEmpty(param.getYwPolicyAppNo())) {
-                        DrivingInsuranceDto drivingInsuranceDto = new DrivingInsuranceDto();
-                        drivingInsuranceDto.setPolicyNumber(param.getYwPolicyNo());
-                        drivingInsuranceDto.setApplicationNumber(param.getYwPolicyAppNo());
-                        JSONArray objects = JSON.parseArray(JSON.toJSONString(Collections.singletonList(drivingInsuranceDto)));
-                        iac.setCrossInsurance(objects);
-                    }
-
-                    if (StringUtils.isNotEmpty(param.getPay_date()) && !"null".equals(param.getPay_date())) {
-                        iac.setPayDate(LocalDateTime.parse(param.getPay_date(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                    }
-                    **/
                 } else {
                     iac = buildCallBack(iac, param);
                 }
-                /**
-                if (iac.getOrderstatus().equals(InsOrderStatusEnum.TO_BACK.getCode())) {
-                    iac.setAuditopinion("交强审核意见：" + param.getJqmessage() + "| 商业审核意见：" + param.getSymessage());
-                }
-                **/
                 //设置支付时间
                 if(iac.getPayDate()==null){
                     iac.setPayDate(LocalDateTime.now());
                 }
-                StringBuffer sss = new StringBuffer();
-                sss.append("变更前订单状态：" + order.getOrderstatus());
-                sss.append("变更前子订单状态：" + iac.getOrderstatus());
-                sss.append("变更后订单状态：" + order.getOrderstatus());
-                log.info("-----------订单状态变动----------：" + sss);
+                log.info("变更前订单状态：" + order.getOrderstatus());
+                log.info("变更前子订单状态：" + iac.getOrderstatus());
+                log.info("变更后订单状态：" + order.getOrderstatus());
                 insAreaCompanyService.updateCompanyAndOrdersNew(iac);
-
-            } else {
-                //失败原因
-                log.info(String.format("永诚API方式 - 补传回调 - 失败，交强保单号：{} ，商业保单号：{}，类型：{}", param.getCiPolicyNo(), param.getBizPolicyNo(),
-                        param.getType()));
-               // return HttpResult.error(param.getMessage());
             }
-            //return HttpResult.ok("操作成功，状态已更新。");
         } catch (JsonProcessingException jsonProcessingException) {
             jsonProcessingException.printStackTrace();
         }
-
-       // throw new SystemException("获取支付连接失败");
     }
 
 }

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

@@ -703,12 +703,6 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         // 1. 协议id获取配置实体
         ZmConfigureParameters zmConfigureParameters = configureParametersComponents.toEntity(ZmConfigureParameters.class,
                 insAreaCompany.getAgreementId());
-
-        if (insAreaCompany.getOrderstatus().equals(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode())) {
-            //return HttpResult.ok(InsOrderStatusEnum.ACCEPT_INSURANCE.getDesc());
-            return;
-        }
-
         // 2. 组装请求体
         OrderStatusRequest orderStatusRequest = new OrderStatusRequest();
         orderStatusRequest.setBusinessNo(insAreaCompany.getId());
@@ -729,14 +723,14 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
             if (orderStatusResponse.getAccidentPolicyNos() != null) {
                 insAreaCompany.setCrossInsurance(JSON.parseArray(JSON.toJSONString(orderStatusResponse.getAccidentPolicyNos())));
             }
+            //设置支付时间
+            if(insAreaCompany.getPayDate()==null){
+                insAreaCompany.setPayDate(LocalDateTime.now());
+            }
             //承保状态
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
             insAreaCompanyService.updateCompanyAndOrdersNew(insAreaCompany);
-
-            //return HttpResult.ok(PaymentStatusEnum.P_2.getMeaning());
         }
-
-        //return HttpResult.error(Enum.valueOf(PaymentStatusEnum.class, "P_" + status).getMeaning());
     }
 }
 

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

@@ -611,15 +611,16 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             if (StringUtils.isNotEmpty(payTime)) {
                 insAreaCompany.setPayDate(LocalDateTime.parse(payTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             }
-
             List<DrivingInsuranceDto> drivingInsuranceDto = queryOrderDetailResponse.getDrivingInsuranceDto();
             insAreaCompany.setCrossInsurance(JSON.parseArray(JSON.toJSONString(drivingInsuranceDto)));
             //更新承保状态
+            //设置支付时间
+            if(insAreaCompany.getPayDate()==null){
+                insAreaCompany.setPayDate(LocalDateTime.now());
+            }
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
             insAreaCompanyService.updateCompanyAndOrdersNew(insAreaCompany);
-           // return HttpResult.ok("订单已支付，订单状态修改完成");
         }
 
-        //return HttpResult.ok("订单还未支付哦.");
     }
 }