bug修改

commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/QuoteEchoVo.java

@@ -345,7 +345,9 @@ public class QuoteEchoVo extends QuoteVo {
             KindInfoVo jqKindInfoVo = new KindInfoVo();
             jqKindInfoVo.setKindCode("J1");
             jqKindInfoVo.setKindName("机动车交通事故责任强制保险");
-            jqKindInfoVo.setPremium(insOrdersVo.getInsOrdersCosts().getJqPremium().toString());
+            if(Objects.nonNull(insOrdersVo.getInsOrdersCosts().getJqPremium())) {
+                jqKindInfoVo.setPremium(insOrdersVo.getInsOrdersCosts().getJqPremium().toString());
+            }
             jqKindInfoVo.setAmount("200000");
             jqKindInfoVo.setServiceTimes("200000");
             jqKindInfoVo.setUnitAmount("200000");

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/build/DaJiaCrawlerQuoteResultsVoBuild.java

@@ -167,20 +167,20 @@ public final class DaJiaCrawlerQuoteResultsVoBuild {
         }
         JSONArray scoreArray = new JSONArray();
         scoreArray.add(new JSONObject()
-                .fluentPut("storeName","交强定价评分")
-                .fluentPut("storeKey","jqPubScores")
+                .fluentPut("scoreName","交强定价评分")
+                .fluentPut("scoreKey","jqPubScores")
                 .fluentPut("score",compulsoryInsurance.getCoefficientInfo().getLossRatioCi()));
         scoreArray.add(new JSONObject()
-                .fluentPut("storeName","商业定价评分")
-                .fluentPut("storeKey","syPubScores")
+                .fluentPut("scoreName","商业定价评分")
+                .fluentPut("scoreKey","syPubScores")
                 .fluentPut("score",businessInsurance.getCoefficientInfo().getLossRatioBi()));
         scoreArray.add(new JSONObject()
-                .fluentPut("storeName","违章评分")
-                .fluentPut("storeKey","carIllegalScore")
+                .fluentPut("scoreName","违章评分")
+                .fluentPut("scoreKey","carIllegalScore")
                 .fluentPut("score",carIllegalScore));
         scoreArray.add(new JSONObject()
-                .fluentPut("storeName","高速风险分")
-                .fluentPut("storeKey","highwayScore")
+                .fluentPut("scoreName","高速风险分")
+                .fluentPut("scoreKey","highwayScore")
                 .fluentPut("score",highwayScore));
         scoreVo.setScoreJson(scoreArray);
         return scoreVo;

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/build/DajiaCrawlerAuditResultsVoBuild.java

@@ -8,6 +8,9 @@ import com.jzg.commons.entity.quote.vo.aggregated.UnderwritingVo;
 import com.jzg.quotation.dajia.crawler.entity.response.DaJiaCrawlerGenerateResponse;
 import com.jzg.quotation.dajia.crawler.entity.response.DaJiaCrawlerSaveResponse;
 
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * @author quchen
  * @date 2026/1/13 9:26
@@ -20,9 +23,18 @@ public final class DajiaCrawlerAuditResultsVoBuild {
         // 公司订单号
         underwritingResultsVo.setCompanyOrderNo(daJiaCrawlerGenerateResponse.getOrderNo());
         // 投保单号
-        String jqProposalNo = daJiaCrawlerGenerateResponse.getJqGenerate().getProposalNo();
-        String syProposalNo = daJiaCrawlerGenerateResponse.getSyGenerate().getProposalNo();
-        String jyProposalNo = daJiaCrawlerGenerateResponse.getJyGenerate().getProposalNo();
+        String jqProposalNo = Optional.ofNullable(daJiaCrawlerGenerateResponse)
+                .map(DaJiaCrawlerGenerateResponse::getJqGenerate)
+                .map(DaJiaCrawlerGenerateResponse.GenerateDTO::getProposalNo)
+                .orElse(null);
+        String syProposalNo = Optional.ofNullable(daJiaCrawlerGenerateResponse)
+                .map(DaJiaCrawlerGenerateResponse::getSyGenerate)
+                .map(DaJiaCrawlerGenerateResponse.GenerateDTO::getProposalNo)
+                .orElse(null);
+        String jyProposalNo = Optional.ofNullable(daJiaCrawlerGenerateResponse)
+                .map(DaJiaCrawlerGenerateResponse::getJyGenerate)
+                .map(DaJiaCrawlerGenerateResponse.GenerateDTO::getProposalNo)
+                .orElse(null);
         underwritingResultsVo.setJqApplyNo(jqProposalNo);
         underwritingResultsVo.setSyApplyNo(syProposalNo);
         underwritingResultsVo.setJyApplyNo(jyProposalNo);
@@ -32,10 +44,10 @@ public final class DajiaCrawlerAuditResultsVoBuild {
             // 失败信息
             StringBuilder sb = new StringBuilder();
             if (null != daJiaCrawlerGenerateResponse.getJqGenerate().getErrorMessage()) {
-                sb.append(String.format("交强险提示信息：s%", daJiaCrawlerGenerateResponse.getJqGenerate().getErrorMessage()));
+                sb.append(String.format("交强险提示信息：%s", daJiaCrawlerGenerateResponse.getJqGenerate().getErrorMessage()));
             }
             if (null != daJiaCrawlerGenerateResponse.getSyGenerate().getErrorMessage()) {
-                sb.append(String.format("商业险提示信息：s%", daJiaCrawlerGenerateResponse.getSyGenerate().getErrorMessage()));
+                sb.append(String.format("商业险提示信息：%s", daJiaCrawlerGenerateResponse.getSyGenerate().getErrorMessage()));
             }
             underwritingResultsVo.setUnderwritingResult(sb.toString());
         } else if (daJiaCrawlerGenerateResponse.getStatus().equals("4")) {

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -301,8 +301,14 @@ public class UnifyOrderManager {
 
         InsOrdersCosts insOrdersCosts = insOrdersCostsService.getById(insOrders.getId());
         InsOrdersPolicy insOrdersPolicy = insOrdersPolicyService.getById(insOrders.getId());
+        // 核保之前判断是否是待核保  或 核保失败
+        StateResult stateResult;
+        if(insOrders.getOrderStatus().equals(InsOrderStatusEnum.WAIT_AUDIT.getCode()) || insOrders.getOrderStatus().equals(InsOrderStatusEnum.AUDIT_FAIL.getCode())){
+            stateResult = orderStateListener.statusChange(InsOrderStatusEnum.AUDIT_ING, InsOrderStatusEnum.WAIT_AUDIT.getCode());
+        }else{
+            stateResult = orderStateListener.statusChange(InsOrderStatusEnum.AUDIT_ING, insOrders.getOrderStatus());
+        }
         //核保之前更新订单为待核保
-        StateResult stateResult = orderStateListener.statusChange(InsOrderStatusEnum.AUDIT_ING, insOrders.getOrderStatus());
         insOrders.setOrderStatus(String.valueOf(stateResult.getCurrentState()));
         insOrdersService.updateById(insOrders);
         // 发送订单状态变更消息
@@ -426,7 +432,7 @@ public class UnifyOrderManager {
 
         List<InsOrdersCarUserInfo> insOrdersCarUserInfos = insOrdersCarUserInfoService.getByOrderId(insuranceUploadImageVo.getOrder().getOrdersNo());
         insuranceUploadImageVo.setInsOrdersCarUserInfoList(insOrdersCarUserInfos);
-        insuranceUploadImageVo.getOrder().setAgreementId(byCompanyId.getData().get(0).getId());
+        insuranceUploadImageVo.getOrder().setAgreementId(insOrders.getAgreementId());
         insuranceUploadImageVo.getOrder().setInsuranceCompanyCode(esmInsCompanyHttpResult.getData().getCompanyCode());
         insuranceUploadImageVo.getOrder().setInsuranceCompanyId(esmInsCompanyHttpResult.getData().getId());
         insuranceUploadImageVo.getOrder().setApiType(Integer.parseInt(insOrders.getApiType()));

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/build/YangGuangApiQuoteResultsVoBuild.java

@@ -158,29 +158,29 @@ public final class YangGuangApiQuoteResultsVoBuild {
         // 评分处理
         JSONArray scoreArray = new JSONArray();
         scoreArray.add(new JSONObject()
-                .fluentPut("storeName","交强合并分")
-                .fluentPut("storeKey","markingnobcCI")
-                .fluentPut("store",discount.getMarkingnobcCI()));
+                .fluentPut("scoreName","交强合并分")
+                .fluentPut("scoreKey","markingnobcCI")
+                .fluentPut("score",discount.getMarkingnobcCI()));
 
         scoreArray.add(new JSONObject()
-                .fluentPut("storeName","商业合并分")
-                .fluentPut("storeKey","markingnobcBI")
-                .fluentPut("store",discount.getMarkingnobcBI()));
+                .fluentPut("scoreName","商业合并分")
+                .fluentPut("scoreKey","markingnobcBI")
+                .fluentPut("score",discount.getMarkingnobcBI()));
 
         scoreArray.add(new JSONObject()
-                .fluentPut("storeName","向阳花标识")
-                .fluentPut("storeKey","XyhGrade")
-                .fluentPut("store",yangGuangAccuracyCalculateResponse.getXYHGrade() != null ? "1" : "0"));
+                .fluentPut("scoreName","向阳花标识")
+                .fluentPut("scoreKey","XyhGrade")
+                .fluentPut("score",yangGuangAccuracyCalculateResponse.getXYHGrade() != null ? "1" : "0"));
 
         scoreArray.add(new JSONObject()
-                .fluentPut("storeName","红黄蓝车系")
-                .fluentPut("storeKey","SeriesTypeActualName")
-                .fluentPut("store",yangGuangAccuracyCalculateResponse.getSeriesTypeActualName() != null ? yangGuangAccuracyCalculateResponse.getSeriesTypeActualName() : ""));
+                .fluentPut("scoreName","红黄蓝车系")
+                .fluentPut("scoreKey","SeriesTypeActualName")
+                .fluentPut("score",yangGuangAccuracyCalculateResponse.getSeriesTypeActualName() != null ? yangGuangAccuracyCalculateResponse.getSeriesTypeActualName() : ""));
 
         scoreArray.add(new JSONObject()
-                .fluentPut("storeName","合并经营成本率")
-                .fluentPut("storeKey","vascostmarginbc")
-                .fluentPut("store",yangGuangAccuracyCalculateResponse.getVascostmarginbc()));
+                .fluentPut("scoreName","合并经营成本率")
+                .fluentPut("scoreKey","vascostmarginbc")
+                .fluentPut("score",yangGuangAccuracyCalculateResponse.getVascostmarginbc()));
         scoreVo.setScoreJson(scoreArray);
 
         if (yangGuangAccuracyCalculateResponse.getNewAndRenewalFlagCI() != null) {

tenant/insurance/quotation-yongcheng/src/main/java/com/jzg/quotation/yongcheng/api/service/impl/YongChengApiRequestImpl.java

@@ -215,10 +215,10 @@ public class YongChengApiRequestImpl implements YongChengApiRequest {
                     underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.AUDIT_FAIL);
                     StringBuilder sb = new StringBuilder();
                     if (null != auditResponse.getSailResponseMessagedate()) {
-                        sb.append(String.format("交强险提示信息：s%", auditResponse.getSailResponseMessagedate().getCMessage()));
+                        sb.append(String.format("交强险提示信息：%s", auditResponse.getSailResponseMessagedate().getCMessage()));
                     }
                     if (null != auditResponse.getCiResponseMessagedate()) {
-                        sb.append(String.format(" 商业险提示信息：s%", auditResponse.getCiResponseMessagedate().getCMessage()));
+                        sb.append(String.format(" 商业险提示信息：%s", auditResponse.getCiResponseMessagedate().getCMessage()));
                     }
                     underwritingResultsVo.setUnderwritingResult(sb.toString());
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementServiceImpl.java

@@ -434,6 +434,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
                     newAgreementCost.setId(null);
                     newAgreementCost.setApproved(0);
                     newAgreementCost.setIsEnabled(0);
+                    newAgreementCost.setCoverRuleId(newAgreementUndwrtRules.getId());
                     newAgreementCost.setPtlAgreementId(newAgreement.getId());
                     agreementCostService.save(newAgreementCost);
                     List<PtlAgreementCostRule> costRules = costRulesMap.get(agreementCost.getId());

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementUndwrtRulesServiceImpl.java

@@ -267,8 +267,12 @@ public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreement
         returnMsg.append(ptlAgreementUndwrtRulesAttr.getAttrName() + "为");
         for(int i=0;i<linkList.getMinArray().length;i++) {
             int finalI = i;
-            PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal = ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x -> x.getCode().equals(linkList.getMinArray()[finalI])).findAny().get();
-            returnMsg.append(ptlAgreementUndwrtRulesDictLabal.getName() + ",");
+            if(ptlAgreementUndwrtRulesAttr.getAttrCode().equals("LicenseNo") || ptlAgreementUndwrtRulesAttr.getAttrCode().equals("LicenseArea")) {
+                returnMsg.append(linkList.getMinArray()[i] + ",");
+            }else {
+                PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal = ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x -> x.getCode().equals(linkList.getMinArray()[finalI])).findAny().get();
+                returnMsg.append(ptlAgreementUndwrtRulesDictLabal.getName() + ",");
+            }
         }
         return returnMsg.toString();
     }