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

src/main/java/com/ydtech/modules/fee/dto/vo/RuleAttrMappingVo.java

@@ -77,6 +77,19 @@ public class RuleAttrMappingVo {
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("RegistrationDate", carInfo.getRegisterDate()));
         //是否过户
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("TransferVehicle", carInfo.isTransferFlag() ? "1" : "0"));
+        //中煤需要判断 初登日期是否等于发证日期  并且 发证日期距离现在不满365天
+        String issueDateStr = carInfo.getIssueDate();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDate issueDate = LocalDate.parse(issueDateStr,formatter);
+        LocalDate today = LocalDate.now();
+        //过滤单交
+        if(insAreaCompany.getCompanyId().equals("ZMBX1000000")) {
+            if (!carInfo.getRegisterDate().equals(carInfo.getIssueDate()) && ChronoUnit.DAYS.between(issueDate, today) <= 365 && !insAreaCompany.getProductid().equals("0330")) {
+                ruleAttrMappingVoList.removeIf(item -> "TransferVehicle".equals(item.getAttrCode()));
+                //如果满足条件的话 直接设置成 过户车
+                ruleAttrMappingVoList.add(new RuleAttrMappingVo("TransferVehicle", "1"));
+            }
+        }
         //是否新车
         //使用注册日期算出自然月 然后判断是否是新旧车
         LocalDate registrationDate = LocalDate.parse(carInfo.getRegisterDate());

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -3546,7 +3546,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                     return true;
                 }
             } else if ("5".equals(ptlAgreementUndwrtRulesAttrLink.getOperator())) {
-                if (!v.isAfter(max)) {
+                if (!(v.isEqual(max) || v.isAfter(max))) {
                     return true;
                 }
             }

src/main/java/com/ydtech/modules/ins/model/vo/CarInfoVo.java

@@ -34,7 +34,7 @@ public class CarInfoVo {
     @ApiModelProperty(value = "行业车型编码")
     private String ciModelCode;
 
-    @NotNull(message = "整备质量不能为空")
+//    @NotNull(message = "整备质量不能为空")
     @Range(message = "整备质量必须为整数")
     @ApiModelProperty(value = "整备质量")
     private String completeKerbMass;

src/main/java/com/ydtech/modules/order/entity/crawler/response/CrawlerQuoteResponse.java

@@ -413,6 +413,12 @@ public class CrawlerQuoteResponse extends CrawlerBaseResponse {
         @JsonProperty("zmScoreLevel")
         private String zmScoreLevel;
 
+        /**
+         * 自主定价系数
+         */
+        @JsonProperty("coefficient")
+        private String coefficient;
+
         public String getDiscount() {
             return StringUtils.isEmpty(discount) ? "0" : discount;
         }

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

@@ -140,6 +140,12 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         // 账号信息
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(agreementId);
 
+        quoteInfoVo.getKindList().forEach(item->{
+            if(item.getKindCode().equals("D4")){
+                item.setAmount(item.getUnitAmount());
+            }
+        });
+
         CrawlerQuoteRequest crawlerQuoteRequest = new CrawlerQuoteRequest();
         BeanUtils.copyProperties(quoteInfoVo, crawlerQuoteRequest);
         crawlerQuoteRequest.setAgreementId(agreementId);
@@ -595,6 +601,8 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         quoteRespVo.setILogPreUdwMess(other.getMark());
         quoteRespVo.setJqScore(other.getJqMark());
         quoteRespVo.setSyScore(other.getSyMark());
+        //自主定价系数
+        quoteRespVo.setPricingCoefficient(other.getCoefficient());
 
 
         //永安

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -1236,7 +1236,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         }
         BeanUtils.copyProperties(agreementSaveDto, ptlAgreement);
         proxyObject.verifyLogin(ptlAgreement, agreementSaveDto, attribution,
-                "1".equals(ptlAgreement.getValidStatus()));
+                true);
         return true;
     }