Merge remote-tracking branch 'origin/dev_jzb_lipf_v20260427'

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrders.java

@@ -81,8 +81,8 @@ public class InsOrders extends BaseModel {
     private String insOrderNo;
 
     @Schema(description = "签单时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate signingTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime signingTime;
 
     @Schema(description = "是否暂存0-保存；1-暂存")
     private int isTemporarily;

commons/src/main/java/com/jzg/commons/entity/vo/InsOrdersOtherInfoVo.java

@@ -21,8 +21,8 @@ public class InsOrdersOtherInfoVo {
     private String companyName;
 
     @Schema(description = "签单时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate signingTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime signingTime;
 
     @Schema(description = "评分")
     private String score;

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/api/service/Impl/GuoRenApiRequestImpl.java

@@ -199,9 +199,13 @@ public class GuoRenApiRequestImpl implements GuoRenApiRequest {
         //配置信息
         GuoRenConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(GuoRenConfigureParameters.class, orderBase.getAttributionInformationVo().getConfigInfo());
         GuoRenApiOrder guoRenApiOrder = guoRenApiOrderService.findByOrdersNo(orderBase.getOrdersNo());
-
-        SubmitAuditResponse auditResponse = guoRenRequestApiComponent.submitAudit(guoRenApiOrder, parameters, url);
         UnderwritingResultsVo underwritingResultsVo = new UnderwritingResultsVo();
+        SubmitAuditResponse auditResponse = guoRenRequestApiComponent.submitAudit(guoRenApiOrder, parameters, url);
+        if (0 != auditResponse.getResultCode()) {
+            underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.AUDIT_FAIL);
+            underwritingResultsVo.setUnderwritingResult("核保失败：" + auditResponse.getResultMsg());
+            return underwritingResultsVo;
+        }
         String jqStatus = auditResponse.getData().get(0).getUnderWriteFlagCI();
         String syStatus = auditResponse.getData().get(0).getUnderWriteFlagBI();
         String message = auditResponse.getData().get(0).getMessage();

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeAuditServiceImpl.java

@@ -301,7 +301,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
             orders.setPayTime(map.get("payDate"));
         }
         if (map.get("signingTime") != null) {
-            orders.setSigningTime(map.get("signingTime").toLocalDate());
+            orders.setSigningTime(map.get("signingTime"));
         }
         //更新时间表
         insOrdersService.updateById(orders);

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/service/Impl/ZiJinApiRequestImpl.java

@@ -125,6 +125,12 @@ public class ZiJinApiRequestImpl implements ZiJinApiRequest {
         try {
             SubmitVerifyResponse submitVerifyResponse = ziJinApiRequestComponent.submitVerify(submitVerifyRequest, httpHeaders);
             logger.info("紫金/submitVerify提交核保接口，结果为：{}", JSON.toJSONString(submitVerifyResponse));
+            if (!"0000".equals(submitVerifyResponse.getRtnCode())){
+                underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.AUDIT_FAIL);
+                underwritingResultsVo.setUnderwritingResult(submitVerifyResponse.getRtnMsg());
+                return underwritingResultsVo;
+            }
+
             SubmitVerifyResponse.SubmitVerifyInfoDTO submitVerifyInfo = submitVerifyResponse.getSubmitVerifyInfo();
             underwritingResultsVo.setJqPolicyno(submitVerifyInfo.getPolicyNoCI());
             underwritingResultsVo.setJqApplyNo(submitVerifyInfo.getProposalNoCI());