1、永诚修改一个bug

README.md

@@ -277,15 +277,14 @@
 
 
 
---------未发布
-**《掌柜鼎PC平台》临时更新公告**
+**《掌柜鼎PC平台》系统维护公告**
 
 * 版本号：v0.0.5.2
 * 访问地址：http://sxzgkj.baoxianzhanggui.com/
 * 需求bug收集表：https://kdocs.cn/l/cloAn4eaINVw
 * APP安卓APK包：http://sxzgkj.baoxianzhanggui.com/web-api/upload/app/2023/10/11/83c6c7bce9fefde9f0e5fb6fcecf0f44.apk
-* 更新日期：2023-00-00
-* 更新时间：00：00  ~  00：00
+* 更新日期：2023-10-16
+* 更新时间：08：30  ~  09：30
 * 更新内容：
   1. 报价单紫金增加驾意险。
   2. 紫金增加欠税信息。
@@ -297,6 +296,7 @@
   8. APP解决人寿、紫金、永诚、恒邦无法报价异常问题。
   9. APP增加年龄、协议自动带出。 
   10. APP医保外额度增加。
+  11. 尝试解决永诚报价提示错误问题。
 
 
 

src/main/java/com/ydtech/modules/ins/model/dto/CarInsDateDto.java

@@ -0,0 +1,19 @@
+package com.ydtech.modules.ins.model.dto;
+
+import lombok.Data;
+
+/**
+ *  车险日期
+ *
+ * @author: lig
+ * @date: 2023-10-16
+ */
+@Data
+public class CarInsDateDto {
+
+    private String startDate;
+    private String endDate;
+    //是即时起保
+    private boolean isForthwith = false;
+
+}

src/main/java/com/ydtech/modules/ins/model/vo/CustomerInfoVo.java

@@ -8,6 +8,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -42,7 +43,7 @@ public class CustomerInfoVo {
 //    private String county;
 
     @ApiModelProperty("省市区数组")
-    private List<String> provinceData;
+    private List<String> provinceData = new ArrayList<>();
 
 
 

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Base.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.ins.model.yc.ruote;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.ydtech.components.InsAlltrustRequestApiComponents;
 import com.ydtech.constants.enums.InsuranceRisk;
+import com.ydtech.modules.ins.model.dto.CarInsDateDto;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
@@ -342,17 +343,24 @@ public class Base {
         RiskInfoVo biRiskInfo = (RiskInfoVo) riskList.stream().filter(x -> x.getRiskCode().equals(InsuranceRisk.BUSINESS.getCode())).findFirst().orElse(null);
 
 
-
+        CarInsDateDto cidd = base.buildInsDate(ciRiskInfo.getStartDate());
         if (null != ciRiskInfo) {
-            if(base.isNowToTodayEnd(ciRiskInfo.getStartDate()))base.setCImmeffMrk("1");
-            base.setTInsrncBgnTmJQ(ciRiskInfo.getStartDate());
-            base.setTInsrncEndTmJQ(ciRiskInfo.getEndDate());
+            base.setTInsrncBgnTmJQ(cidd.getStartDate());
+            base.setTInsrncEndTmJQ(cidd.getEndDate());
             base.setCAppJqFlag("Y");
             base.setCProdNoJQ("0326");
+            base.setCImmeffMrk(cidd.isForthwith() == true ? "1" : "0");
+
+//
+//            if(base.isNowToTodayEnd(ciRiskInfo.getStartDate()))base.setCImmeffMrk("1");
+//            base.setTInsrncBgnTmJQ(ciRiskInfo.getStartDate());
+//            base.setTInsrncEndTmJQ(ciRiskInfo.getEndDate());
+//            base.setCAppJqFlag("Y");
+//            base.setCProdNoJQ("0326");
         }
 
         if (null != biRiskInfo) {
-            if(base.isNowToTodayEnd(biRiskInfo.getStartDate()))base.setCImmeffMrk("1");
+            base.setCImmeffMrk(cidd.isForthwith() == true ? "1" : "0");
             base.setTInsrncBgnTmSY(biRiskInfo.getStartDate());
             base.setTInsrncEndTmSY(biRiskInfo.getEndDate());
             base.setAppSYFlag("Y");
@@ -363,14 +371,30 @@ public class Base {
     }
 
 
-
-    private boolean isNowToTodayEnd(String dateTime){
+    private boolean isNowToTodayEnd(String dateTime) {
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime todayEnd = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
-        LocalDateTime startDateTime = DateTimeUtil.parseLocalDateTime(dateTime,DateTimeUtil.DATETIME_PATTERN);
+        LocalDateTime startDateTime = DateTimeUtil.parseLocalDateTime(dateTime, DateTimeUtil.DATETIME_PATTERN);
 
         return startDateTime.isAfter(now) && startDateTime.isBefore(todayEnd);
     }
 
 
+    private CarInsDateDto buildInsDate(String startDate) {
+        CarInsDateDto cidd = new CarInsDateDto();
+        if (isNowToTodayEnd(startDate)) {
+            cidd.setForthwith(true);
+            cidd.setStartDate(startDate);
+
+            LocalDateTime sEndDateTime = DateTimeUtil.parseLocalDateTime(startDate, DateTimeUtil.DATETIME_PATTERN);
+            sEndDateTime = sEndDateTime.plusYears(1);
+
+            cidd.setEndDate(DateTimeUtil.getFirstDayOfYearStr(sEndDateTime));
+
+        }
+        return cidd;
+
+    }
+
+
 }

src/main/java/com/ydtech/modules/ins/model/yc/ruote/response/ProposalResponse.java

@@ -0,0 +1,51 @@
+package com.ydtech.modules.ins.model.yc.ruote.response;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import lombok.Data;
+
+
+/**
+ * 响应
+ * 意外险信息
+ * 代码：proposal
+ *
+ * @author: lig
+ * @date: 2023-02-08
+ */
+@Data
+public class ProposalResponse {
+
+
+    /**
+     * 保额
+     */
+    @JacksonXmlProperty(localName = "amount")
+    private String amount;
+
+    /**
+     * 保险止期
+     */
+    @JacksonXmlProperty(localName = "endDate")
+    private String endDate;
+
+    /**
+     * 保费
+     */
+    @JacksonXmlProperty(localName = "premium")
+    private String premium;
+
+    /**
+     * 投保单号
+     */
+    @JacksonXmlProperty(localName = "proposalno")
+    private String proposalno;
+
+    /**
+     * 保险起期
+     */
+    @JacksonXmlProperty(localName = "startDate")
+    private String startDate;
+
+}
+
+

src/main/java/com/ydtech/modules/ins/service/impl/InsAlltrustApiServiceImpl.java

@@ -277,6 +277,7 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
      * 2 报价
      */
     @Override
+    @Transactional
     public HttpResult quoteApi(BaseQuoteVo<AccidentalDrivingVo> quoteVo) {
 
 
@@ -617,7 +618,7 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
 //            findRegion()
 
             //接口请求
-            String responseData = httpPostResultLog(gainXmlMapper(), m, YcBuildData.API_AUDIT, "永诚API方式 - 核保 - ");
+            String responseData = httpPostResultLog(gainXmlMapper(), m, YcBuildData.API_AUDIT, "永诚API方式 - 核保（车牌号："+order.getLicenseno()+"） - ");
 
             String cleanStr = YcBuildData.cleanResponseStr(responseData);
             AuditResponse rd = gainXmlMapper().readValue(cleanStr, AuditResponse.class);
@@ -645,7 +646,7 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
                 buildOrderStatus(order, iac);
 
             } else {
-                return HttpResult.error(logNo + "核保失败" + rd.getResponseHead().getReturnMessage());
+                return HttpResult.error(logNo + "核保失败，车牌号："+ order.getLicenseno() + " ," + rd.getResponseHead().getReturnMessage());
             }
 
             iac.setAuditid(order.getUserid());