1. 华农添加评分分组

2. 华农添加评分分组费用因子
3. 大地添加商业险种

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

@@ -425,6 +425,13 @@ public class RuleAttrMappingVo {
                     ruleAttrMappingVoList.add(new RuleAttrMappingVo("CifeeFloat", x));
                 });
 
+        // 华农评分分组
+        Optional.ofNullable(quoteRespVo)
+                .map(quoteRespVo1 -> quoteRespVo.getMarkGroup())
+                .ifPresent(x -> {
+                    ruleAttrMappingVoList.add(new RuleAttrMappingVo("MarkGroup", x));
+                });
+
         //永安商业费用浮动
         Optional.ofNullable(quoteRespVo)
                 .map(quoteRespVo1 -> quoteRespVo.getBifeeFloat())

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

@@ -256,6 +256,9 @@ public class QuoteRespVo {
     @ApiModelProperty("大地 不浮动原因")
     private String reasonNoFluctuation;
 
+    @ApiModelProperty("华农评分分组")
+    private String markGroup;
+
     public void setJqClaims(String jqClaims) {
         this.jqClaims = StringUtils.isEmpty(jqClaims) ? null : jqClaims;
     }

src/main/java/com/ydtech/modules/order/entity/InsBusinessInsurance.java

@@ -69,7 +69,8 @@ public class InsBusinessInsurance implements Serializable {
     public static boolean isAdditionalInsurance(String kindCode){
         if(kindCode.equals("D3") || kindCode.equals("D4") || kindCode.equals("L") || kindCode.equals("MJ1") || kindCode.equals("MJ2") ||
         kindCode.equals("MJ3") || kindCode.equals("MJ4") || kindCode.equals("SY_FJ_YBW1") || kindCode.equals("SY_FJ_YBW2") ||
-        kindCode.equals("SY_FJ_YBW3") || kindCode.equals("BD") || kindCode.equals("SY_WBDWGZ")){
+        kindCode.equals("SY_FJ_YBW3") || kindCode.equals("SY_FJ_YBW4") || kindCode.equals("SY_FJ_YBW5") || kindCode.equals("SY_FJ_YBW6") ||
+                kindCode.equals("BD") || kindCode.equals("SY_WBDWGZ")){
             return true;
         }
         return false;

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

@@ -395,6 +395,13 @@ public class CrawlerQuoteResponse extends CrawlerBaseResponse {
         @JsonProperty("reason_no_fluctuation")
         private String reasonNoFluctuation;
 
+        /**
+         * 华农评分分组
+         * @return
+         */
+        @JsonProperty("markgroup")
+        private String markGroup;
+
         public String getDiscount() {
             return StringUtils.isEmpty(discount) ? "0" : discount;
         }

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

@@ -685,7 +685,11 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
             }
         }
 
-        //保存订单信息
+        if (response != null && response.getOther() != null && response.getOther().getMarkGroup() != null) {
+            quoteRespVo.setMarkGroup(response.getOther().getMarkGroup());
+        }
+
+            //保存订单信息
         InsAreaCompany insAreaCompany = new InsAreaCompany(quoteRespVo, ptlAgreementAttribution);
 
         //在修改中