保司地址接口

commons/src/main/java/com/jzg/commons/entity/agreement/po/PtlAgreementUrl.java

@@ -1,5 +1,7 @@
 package com.jzg.commons.entity.agreement.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jzg.commons.entity.agreement.vo.PtlAgreementUrlVo;
 import com.jzg.commons.util.idgen.IdGenerate;
@@ -19,17 +21,23 @@ import lombok.NoArgsConstructor;
 public class PtlAgreementUrl {
 
     @Schema(description = "id")
+    @TableId(value = "id")
     private String id;
 
     @Schema(description = "账号归属名称")
+    @TableField(value = "name")
     private String name;
 
     @Schema(description = "登录地址")
+    @TableField(value = "url")
     private String url;
 
+
+    @TableField(value = "company_id")
     @Schema(description = "保险公司id")
     private String companyId;
 
+    @TableField(exist = false)
     private String companyName;
 
     public PtlAgreementUrl(PtlAgreementUrlVo ptlAgreementUrlVo) {

platform/src/main/java/com/jzg/service/impl/PtlAgreementUrlServiceImpl.java

@@ -28,7 +28,7 @@ public class PtlAgreementUrlServiceImpl extends ServiceImpl<PtlAgreementUrlMappe
     public boolean addPtlAgreementUrl(PtlAgreementUrlVo ptlAgreementUrlVo) {
         PtlAgreementUrl ptlAgreementUrl = new PtlAgreementUrl();
         BeanUtils.copyProperties(ptlAgreementUrlVo, ptlAgreementUrl);
-        save(ptlAgreementUrl);
+        this.save(ptlAgreementUrl);
         return true;
     }
 

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/componet/YangGuangApiRequestComponent.java

@@ -8,6 +8,7 @@ import com.jzg.quotation.commons.utils.InsuranceLog;
 import com.jzg.quotation.yangguang.api.entity.request.*;
 import com.jzg.quotation.yangguang.api.entity.response.*;
 import com.jzg.quotation.yangguang.api.properties.YangGuangApiProperties;
+import com.sunyard.insurance.encode.client.EncodeAccessParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpException;
@@ -115,8 +116,8 @@ public class YangGuangApiRequestComponent {
         String url = yangGuangApiProperties.getUploadUrl();
         String secret = yangGuangApiProperties.getSecret();
         String referer = yangGuangApiProperties.getReferer();
-        //String encode = EncodeAccessParam.getEncodeParam(String.valueOf(json), 1000L,secret);
-        //responesStr = httpPost(url,"req", encode, referer);
+        String encode = EncodeAccessParam.getEncodeParam(String.valueOf(json), 1000L,secret);
+        responesStr = httpPost(url,"req", encode, referer);
         return responesStr;
     }
 

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/request/YangGuangAccuracyCalculateRequest.java

@@ -227,17 +227,33 @@ public class YangGuangAccuracyCalculateRequest extends YangGuangBaseRequest{
         // 处理起保日期和终保日期
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         if (Objects.nonNull(quoteVo.getCiRiskInfoVo())) {
+            // 基础保险期限计算
+            LocalDateTime ciStartTime;
+            LocalDateTime ciEndTime;
             String ciStartDate = quoteVo.getCiRiskInfoVo().getStartDate();
-            LocalDateTime ciStartTime = LocalDateTime.parse(ciStartDate, formatter);
-            LocalDateTime ciEndTime = ciStartTime.plusYears(1).minusDays(1).minusSeconds(1);
+            if (ciStartDate.endsWith("00:00:00")) {
+                ciStartTime = LocalDateTime.parse(ciStartDate, formatter);
+                ciEndTime = ciStartTime.plusYears(1).minusSeconds(1);
+            } else {
+                ciStartTime = LocalDateTime.parse(ciStartDate, formatter);
+                ciEndTime = ciStartTime.plusYears(1).minusDays(1).minusSeconds(1);
+            }
             this.CiStartDate = ciStartTime.format(formatter);
             this.CiEndDate = ciEndTime.format(formatter);
             this.CiImmediateFlag = quoteVo.getCiRiskInfoVo().isInstantFlag() ? "1" : "0";
         }
         if (Objects.nonNull(quoteVo.getBiRiskInfoVo())) {
+            // 基础保险期限计算
+            LocalDateTime biStartTime;
+            LocalDateTime biEndTime;
             String biStartDate = quoteVo.getBiRiskInfoVo().getStartDate();
-            LocalDateTime biStartTime = LocalDateTime.parse(biStartDate, formatter);
-            LocalDateTime biEndTime = biStartTime.plusYears(1).minusDays(1).minusSeconds(1);
+            if (biStartDate.endsWith("00:00:00")) {
+                biStartTime = LocalDateTime.parse(biStartDate, formatter);
+                biEndTime = biStartTime.plusYears(1).minusSeconds(1);
+            } else {
+                biStartTime = LocalDateTime.parse(biStartDate, formatter);
+                biEndTime = biStartTime.plusYears(1).minusDays(1).minusSeconds(1);
+            }
             this.BiStartDate = biStartTime.format(formatter);
             this.BiEndDate = biEndTime.format(formatter);
             this.BiImmediateFlag = quoteVo.getBiRiskInfoVo().isInstantFlag() ? "1" : "0";

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/service/impl/YangGuangApiRequestImpl.java

@@ -82,9 +82,7 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
                 DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                 LocalDateTime dateTime = LocalDateTime.parse(endDate, inputFormatter);
                 String newDateStr = dateTime.format(outputFormatter);
-                if (!response.getRemarkCi().equals("")) {
-                    quoteVo.getCiRiskInfoVo().setStartDate(newDateStr);
-                }
+                quoteVo.getCiRiskInfoVo().setStartDate(newDateStr);
                 YangGuangAccuracyCalculateRequest newRequest = new YangGuangAccuracyCalculateRequest(quoteVo, carModel,parameters);
                 newRequest.setInfotransNo(yangGuangQueryVehicleModelResponse.getInfotransNo());
                 return recursiveQuote(newRequest, carModel, yangGuangQueryVehicleModelResponse,quoteVo, parameters);