Merge branch 'master' into test

src/main/java/com/ydtech/modules/ins/model/InsOrdersExcel.java

@@ -19,6 +19,9 @@ public class InsOrdersExcel {
     @ExcelProperty(value = "协议号")
     private String agreementId;
 
+    @ExcelIgnore
+    private String apiType;
+
     @ExcelProperty(value = "工号")
     private String userId;
 

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

@@ -46,6 +46,7 @@ import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.InsOrdersTrack;
 import com.ydtech.modules.order.entity.bo.UnderwritingRulesBo;
+import com.ydtech.modules.order.entity.crawler.response.CrawlerVerifyPaymentResponse;
 import com.ydtech.modules.order.entity.dto.DrivingInsuranceDto;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
 import com.ydtech.modules.order.entity.vo.*;
@@ -53,6 +54,7 @@ import com.ydtech.modules.order.entity.vo.ya.YaExtendInfoDto;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.InsOrdersTrackService;
+import com.ydtech.modules.protocol.entity.constants.PtlApiType;
 import com.ydtech.modules.protocol.entity.dto.PtlAgreementInsCompanyDto;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
@@ -479,12 +481,24 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
             //非车
             if (!ObjectUtils.isEmpty(insOrdersExcel.getCrossInsurance())) {
-                List<DrivingInsuranceDto> drivingInsuranceDtos =
-                        insOrdersExcel.getCrossInsurance().toJavaList(DrivingInsuranceDto.class);
-                if (!drivingInsuranceDtos.isEmpty()) {
-                    String policyNumber = drivingInsuranceDtos.get(0).getPolicyNumber();
-                    insOrdersExcel.setJyPolicyno(policyNumber);
+
+                if(String.valueOf(PtlApiType.PTL_API_2.getCode()).equals(insOrdersExcel.getApiType())){
+                    List<CrawlerVerifyPaymentResponse.DrivingInsurancesDTO> drivingInsurancesDTOS =
+                            insOrdersExcel.getCrossInsurance().toJavaList(CrawlerVerifyPaymentResponse.DrivingInsurancesDTO.class);
+                    if (!drivingInsurancesDTOS.isEmpty()) {
+                        String policyNumber = drivingInsurancesDTOS.get(0).getPolicy();
+                        insOrdersExcel.setJyPolicyno(policyNumber);
+                    }
+                }else {
+                    List<DrivingInsuranceDto> drivingInsuranceDtos =
+                            insOrdersExcel.getCrossInsurance().toJavaList(DrivingInsuranceDto.class);
+                    if (!drivingInsuranceDtos.isEmpty()) {
+                        String policyNumber = drivingInsuranceDtos.get(0).getPolicyNumber();
+                        insOrdersExcel.setJyPolicyno(policyNumber);
+                    }
                 }
+
+
             }
 
             // 设置险种信息

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -119,6 +119,7 @@
         <result property="score" column="score" jdbcType="VARCHAR"/>
         <result property="ownerInfo" column="ownerinfo" javaType="com.alibaba.fastjson.JSONObject"  typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
         <result property="jqpRemIum" column="jqpremium" jdbcType="VARCHAR"/>
+        <result property="apiType" column="api_type" jdbcType="VARCHAR"/>
         <result property="jqPolicyno" column="jqpolicyno" jdbcType="VARCHAR"/>
         <result property="sypRemIum" column="sypremium" jdbcType="VARCHAR"/>
         <result property="syPolicyno" column="sypolicyno" jdbcType="VARCHAR"/>
@@ -354,6 +355,7 @@
         a.licenseno,
         a.frameno,
         a.carinfo,
+        b.api_type,
         b.score,
         a.ownerinfo,
         b.jqpremium,