Merge branch 'feature_20240605_zhaohaipeng_ad_filter_exp' of algorithm/ad-engine into master

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

@@ -6,7 +6,6 @@ import com.tzld.piaoquan.ad.engine.commons.redis.AlgorithmRedisHelper;
 import com.tzld.piaoquan.ad.engine.commons.score.ScoreParam;
 import com.tzld.piaoquan.ad.engine.service.score.dto.AdPlatformCreativeDTO;
 import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdRankItem;
-import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.math3.distribution.BetaDistribution;
 import org.slf4j.Logger;
@@ -436,7 +435,7 @@ public class VideoAdThompsonScorerV2 {
                 double vidCidScore = this.orderDivideExp(vidCidStatistic);
 
 
-                if (w1 != 0 || w2 != 0) {
+                if (w1 != 0 || w2 != 0 || vidCidExp != 0 || cidExp != 0) {
                     score = ((w1 * vidCidScore * vidCidExp + w2 * cidScore * cidExp) / (w1 * vidCidExp + w2 * cidExp)) * cpa;
                 }
 
@@ -457,6 +456,7 @@ public class VideoAdThompsonScorerV2 {
                 ext.put("cpa", cpa);
             } catch (Exception e) {
                 log.error("svc=670exp, error: ", e);
+                score = 0; // 确保在异常情况下`score`有一个默认值
             }
 
             AdRankItem item = new AdRankItem();