save 添加爬虫报价 协议ID 字段

src/main/java/com/ydtech/modules/order/entity/crawler/request/CrawlerBaseRequest.java

@@ -20,6 +20,11 @@ public class CrawlerBaseRequest implements Serializable {
     @JsonProperty(value = "plyappno")
     private String orderNo;
 
+    /**
+     * 协议ID
+     */
+    private String agreementId;
+
     /**
      * 保险公司平台账号
      */
@@ -32,10 +37,9 @@ public class CrawlerBaseRequest implements Serializable {
     @JsonProperty(value = "proposalCheckNo")
     private String proposalCheckNo;
 
-
-
-    public CrawlerBaseRequest(String orderNo, String username){
+    public CrawlerBaseRequest(String orderNo, String username, String agreementId){
         this.orderNo = orderNo;
         this.username = username;
+        this.agreementId = agreementId;
     }
 }

src/main/java/com/ydtech/modules/order/entity/crawler/request/CrawlerLoginRequest.java

@@ -27,6 +27,12 @@ public class CrawlerLoginRequest implements Serializable {
     @JsonProperty(value = "pwd")
     private String password;
 
+    /**
+     * 协议ID
+     */
+    private String agreementId;
+
+
     @JsonProperty(value = "check")
     private String check;
 
@@ -39,6 +45,7 @@ public class CrawlerLoginRequest implements Serializable {
 
 
     public CrawlerLoginRequest(PtlAgreementAttributionDto attribution) {
+        this.agreementId = attribution.getId();
         this.username = attribution.getUsername();
         this.password = attribution.getPassword();
         // 环境 新增变量

src/main/java/com/ydtech/modules/order/entity/crawler/request/CrawlerQuoteRequest.java

@@ -13,6 +13,11 @@ public class CrawlerQuoteRequest extends BaseQuoteInfoVo {
 
     private static final long serialVersionUID = -5475454567145093972L;
 
+    /**
+     * 协议ID
+     */
+    private String agreementId;
+
     /**
      * 保险公司平台账号
      */

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

@@ -142,6 +142,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
 
         CrawlerQuoteRequest crawlerQuoteRequest = new CrawlerQuoteRequest();
         BeanUtils.copyProperties(quoteInfoVo, crawlerQuoteRequest);
+        crawlerQuoteRequest.setAgreementId(agreementId);
         crawlerQuoteRequest.setMaxQuoteNum(maxQuoteNum);
         crawlerQuoteRequest.setUsername(ptlAgreementAttribution.getUsername());
         // 人保赔付优化申请
@@ -389,10 +390,10 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         if(insAreaCompany.getCompanyId().equals("ZKIC1000000")) {
             String extendInfoStr = String.valueOf(insAreaCompany.getExtendInfo());
             JSONObject extendInfo = JSONObject.parseObject(extendInfoStr);
-            crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo(),
+            crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getId(),
                     ptlAgreementAttribution.getUsername(), extendInfo.getString("proposalCheckNo"));
         }else {
-            crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername());
+            crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername(),  ptlAgreementAttribution.getId());
         }
         CrawlerAuditResponse crawlerAuditResponse = insCrawlerOrderComponents.request(apiUrl, insAreaCompany.getCompanyId(),
                 PtlCrawlerApiType.API_4.getDesc(), crawlerBaseRequest, CrawlerAuditResponse.class);
@@ -434,7 +435,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         //组装参数
         // 账号信息
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(insAreaCompany.getAgreementId());
-        CrawlerBaseRequest crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername());
+        CrawlerBaseRequest crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername(), ptlAgreementAttribution.getId());
         CrawlerVerifyPaymentResponse crawlerAuditResponse = insCrawlerOrderComponents.request(apiUrl, insAreaCompany.getCompanyId(),
                 PtlCrawlerApiType.API_5.getDesc(), crawlerBaseRequest, CrawlerVerifyPaymentResponse.class);
 
@@ -471,7 +472,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(insAreaCompany.getAgreementId());
         //组装参数
 
-        CrawlerBaseRequest crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername());
+        CrawlerBaseRequest crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername(), ptlAgreementAttribution.getId());
         CrawlerPolicyPrintResponse response = insCrawlerOrderComponents.request(apiUrl, insAreaCompany.getCompanyId(),
                 PtlCrawlerApiType.API_6.getDesc(), crawlerBaseRequest, CrawlerPolicyPrintResponse.class);
 
@@ -725,8 +726,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
 
         if (response.getOther()
                 .getCiMessage() != null && !response.getOther()
-                .getCiMessage()
-                .equals("")) {
+                .getCiMessage().isEmpty()) {
             quoteRespVo.setCiMessage(response.getOther()
                     .getCiMessage());
             insAreaCompany.setCiMessage(response.getOther()
@@ -866,7 +866,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         // 账号信息
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(insAreaCompany.getAgreementId());
         //组装参数
-        CrawlerBaseRequest crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername());
+        CrawlerBaseRequest crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername(), ptlAgreementAttribution.getId());
         CrawlerVerifyPaymentResponse crawlerAuditResponse = insCrawlerOrderComponents.request(apiUrl, insAreaCompany.getCompanyId(),
                 PtlCrawlerApiType.API_5.getDesc(), crawlerBaseRequest, CrawlerVerifyPaymentResponse.class);
 
@@ -909,7 +909,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
     private boolean quashOrder(InsAreaCompany insAreaCompany) {
         // 账号信息
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(insAreaCompany.getAgreementId());
-        CrawlerBaseRequest crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername());
+        CrawlerBaseRequest crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername(), ptlAgreementAttribution.getId());
         CrawlerBaseResponse request = insCrawlerOrderComponents.request(apiUrl, insAreaCompany.getCompanyId(),
                 PtlCrawlerApiType.API_9.getDesc(), crawlerBaseRequest, CrawlerBaseResponse.class);
         if (request.getCode() == CrawlerAuditStatus.CAS_200.getCode()) {