feat:合并master

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

@@ -280,16 +280,14 @@ public class VideoAdThompsonScorerV2 {
             CreativeStatistic cidStatistic = cidMap.getOrDefault(dto.getCreativeId(), new CreativeStatistic());
             CreativeStatistic vidCidStatistic = vidCidMap.getOrDefault(dto.getCreativeId(), new CreativeStatistic());
 
-            log.info("cid: {} statistics: {}", dto.getCreativeId(), JSON.toJSONString(cidStatistic));
-            log.info("cid: {} vidCidStatistic: {}", dto.getCreativeId(), JSON.toJSONString(vidCidStatistic));
-
             double cidScore = this.calcThompsonScore(expParam, cidStatistic, alpha, cidBeta);
             double vidCidScore = this.calcThompsonScore(expParam, vidCidStatistic, alpha, vidCidBeta);
             double w1 = expParam.getOrDefault("w1", 1d);
             double w2 = expParam.getOrDefault("w2", 1d);
             double score = ((w1 * vidCidScore + w2 * cidScore) / (w1 + w2)) * dto.getCpa();
 
-            log.info("calcScore w1: {}, w1: {}, cidScore: {}, vidCidScore: {}", w1, w2, cidScore, vidCidScore);
+            log.info("669 and 670 calcScore cid: {}, score: {}, w1: {}, w2: {}, cidScore: {}, vidCidScore: {}, cidStatistics: {}, vidCidStatistics: {} ",
+                    dto.getCreativeId(), score, w1, w2, cidScore, vidCidScore, JSON.toJSONString(cidStatistic), JSON.toJSONString(vidCidStatistic));
 
             AdRankItem item = new AdRankItem();
             item.setCpa(dto.getCpa());