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

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

@@ -246,6 +246,12 @@ public class InsOrdersEditingVo extends InsOrders implements Serializable {
         @ApiModelProperty("产品id")
         private String productid;
 
+        @ApiModelProperty("驾意险份数")
+        private String jyQuantity;
+
+        @ApiModelProperty("驾意险名称")
+        private String jyName;
+
         public void feeVacant() {
             this.jqExportFee = null;
             this.syExportFee = null;

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

@@ -82,7 +82,7 @@ public class CarModelServiceImpl implements CarModelService {
 
     @Override
     public JSONObject licenseSearch(String licenseNo) {
-        String requestUrl = "http://47.92.254.66:8088/lsearch/1";
+        String requestUrl = "http://39.98.41.104:8088/lsearch/1";
         JSONObject params = new JSONObject();
         params.put("license",licenseNo);
         OkHttpClient client = new OkHttpClient().newBuilder()

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

@@ -1103,7 +1103,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
         ptlAgreementInsCompanyDtos.forEach(companyDto -> {
             InsOrdersEditingVo.InsAreaCompanyEditingDto insAreaCompanyEditingDto = insAreaCompanyEditingDtos.stream().filter(x -> x.getInscompany().equals(companyDto.getNamesimple())).findFirst().orElse(null);
-            companyDto.setEditingDto(insAreaCompanyEditingDto);
+            if(!Objects.isNull(insAreaCompanyEditingDto)) {
+                InsAreaCompanyAccidentalDriving byCompanyId = insAreaCompanyAccidentalDrivingService.getByCompanyId(insAreaCompanyEditingDto.getCompanyId());
+                if(!Objects.isNull(byCompanyId)){
+                    insAreaCompanyEditingDto.setJyQuantity(byCompanyId.getQuantity().toString());
+                    insAreaCompanyEditingDto.setJyName(byCompanyId.getRideRiskName());
+                }
+                companyDto.setEditingDto(insAreaCompanyEditingDto);
+            }
         });
 
         List<String> companyIds = insAreaCompanyEditingDtos.stream().map(x -> x.getCompanyId()).collect(Collectors.toList());

src/main/java/com/ydtech/modules/scheme/service/impl/PtlSchemeRulesServiceImpl.java

@@ -146,6 +146,10 @@ public class PtlSchemeRulesServiceImpl extends ServiceImpl<PtlSchemeRulesMapper,
         //用户可读取的所有保险公司id
         List<String> companyIds = agreementInsCompany.stream().map(PtlAgreementInsCompanyDto::getId).collect(Collectors.toList());
 
+        if(companyIds.isEmpty()){
+            throw new SystemException("暂无可报价公司");
+        }
+
         //获取所有规则的保险公司id
         List<PtlAgreementInsCompanyDto> ptlAgreementInsCompanyDtos = new ArrayList<>();