Merge branch 'feature_20240621_zhaohaipeng_fm' into test

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/feature/FeatureService.java

@@ -1,9 +1,6 @@
 package com.tzld.piaoquan.ad.engine.service.feature;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
 import com.google.common.reflect.TypeToken;
-import com.sun.corba.se.spi.ior.iiop.IIOPFactories;
 import com.tzld.piaoquan.ad.engine.commons.score.ScoreParam;
 import com.tzld.piaoquan.ad.engine.commons.util.JSONUtils;
 import com.tzld.piaoquan.ad.engine.service.remote.FeatureV2RemoteService;

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/impl/TacticsAndLRModelScoreRankService.java

@@ -64,8 +64,8 @@ public class TacticsAndLRModelScoreRankService {
 
         if (scoreDetail.containsKey("excludeConv") || scoreDetail.containsKey("excludeClick") || scoreDetail.containsKey("excludeView")) {
             double excludeConv = Double.parseDouble(scoreDetail.getOrDefault("excludeConv", "10000"));
-            double excludeClick = Double.parseDouble(scoreDetail.getOrDefault("excludeClick", "100001"));
-            double excludeView = Double.parseDouble(scoreDetail.getOrDefault("excludeView", "100001"));
+            double excludeClick = Double.parseDouble(scoreDetail.getOrDefault("excludeClick", "10000"));
+            double excludeView = Double.parseDouble(scoreDetail.getOrDefault("excludeView", "10000"));
             excludeMin = NumUtil.min(excludeConv, excludeClick, excludeView);
         }