Merge branch 'refs/heads/master' into dev-xym-add-filter-config

.gitignore

@@ -18,6 +18,7 @@ target/
 *.iws
 *.iml
 *.ipr
+*.md
 
 ### NetBeans ###
 /nbproject/private/

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/enums/CrowdLayerEnum.java

@@ -7,8 +7,9 @@ public enum CrowdLayerEnum {
 
 
     NO_EXPOSURE(1, "无曝光"),
-    WITH_CONVERSION(2, "有转化"),
-    WITH_EXPOSURE_NO_CONVERSION(3, "有曝光无转化"),
+    WITH_EXPOSURE_NO_CLICK(2, "有曝光无点击"),
+    WITH_CLICK_NO_CONVERSION(3, "有点击无转化"),
+    WITH_CONVERSION(4, "有转化"),
     ;
     private Integer code;
     private String desc;

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/strategy/RankStrategyBasic.java

@@ -444,7 +444,7 @@ public abstract class RankStrategyBasic implements RankStrategy {
             }
 
             // 保量人群代码有值，进行人群匹配判断
-            String userLayer = reqFeature.getOrDefault("layer", "");
+            String userLayer = reqFeature.getOrDefault("layer_l4", "");
 
             // 获取用户人群对应的CrowdLayerEnum code
             Integer userCrowdCode = getUserCrowdCode(userLayer);