Merge remote-tracking branch 'origin/test' into test

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

@@ -61,4 +61,14 @@ public class CrawlerQuoteRequest extends BaseQuoteInfoVo {
      */
     List<CrawlerImageRequest.B64phoListDTO> b64pho_list;
 
+    /**
+     * 人保车损保额折扣
+     */
+    private String pricecoefficient;
+
+    /**
+     * 中煤网点代码
+     */
+    private String netpointcode;
+
 }

src/main/java/com/ydtech/modules/order/entity/vo/BaseQuoteVo.java

@@ -179,4 +179,7 @@ public class BaseQuoteVo<T> {
     @ApiModelProperty("是否现询 1.是 2.否")
     private String costFlag;
 
+    // 人保车损保额折扣
+    private String priceCoefficient;
+
 }

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

@@ -1,6 +1,7 @@
 package com.ydtech.modules.order.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.constants.InsuranceEnum;
@@ -166,6 +167,18 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
             String quoteNo = order.getQuoteno();
             List<InsTaskImagesBase64> insTaskImagesBase64List = insTaskImagesService.findByQuoteNoToBase64(quoteNo, ptlAgreementAttribution.getInsCompanyId());
             crawlerQuoteRequest.setB64pho_list(CrawlerImageRequest.toB64phoListDTO(insTaskImagesBase64List));
+            crawlerQuoteRequest.setPricecoefficient(t.getPriceCoefficient() == null ? "1" : t.getPriceCoefficient());
+        }
+
+        // 中煤添加netpointcode 代码
+        if (ptlAgreementAttribution.getInsCompanyId().equals("ZMBX1000000")){
+            JSONArray fields = ptlAgreementAttribution.getFields();
+            for(int k=0;k<fields.size();k++){
+                JSONObject jsonObject = fields.getJSONObject(k);
+                if("netpointcode".equals(jsonObject.getString("field"))){
+                    crawlerQuoteRequest.setNetpointcode(jsonObject.getString("value"));
+                }
+            }
         }
 
         // 发送请求

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

@@ -322,6 +322,12 @@ public class InsOrderPdfUrlServiceImpl extends ServiceImpl<InsOrderPdfUrlMapper,
                 return insCrawlerOrderService.getPolicyByCompanyIdPdfList(subOrder,insOrders,flag);
             }
         }
+        //人保
+        else if(subOrder.getCompanyId().contains(InsuranceEnum.PICC.getCode())){
+            if (subOrder.getApiType()!=null && subOrder.getApiType() == 2) {
+                return insCrawlerOrderService.getPolicyByCompanyIdPdfList(subOrder,insOrders,flag);
+            }
+        }
 
         return null;
     }