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

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

@@ -322,13 +322,13 @@ public class RankStrategyBy843 extends RankStrategyBasic {
                 if (h5Page) {
                     double conver3D = Double.parseDouble(b3Feature.getOrDefault("ad_conversion_3d", "0"));
                     double smoothCxr3D = NumUtil.divSmoothV1(conver3D, view3Day + h5PagePlus, 1.64);
-                    double view1Day = Double.parseDouble(b3Feature.getOrDefault("ad_view_1d", "0"));
-                    double conver1D = Double.parseDouble(b3Feature.getOrDefault("ad_conversion_1d", "0"));
-                    double smoothCxr1D = NumUtil.divSmoothV1(conver1D, view1Day + h5PagePlus, 1.64);
+                    double view12H = Double.parseDouble(b3Feature.getOrDefault("ad_view_12h", "0"));
+                    double conver12H = Double.parseDouble(b3Feature.getOrDefault("ad_conversion_12h", "0"));
+                    double smoothCxr12H = NumUtil.divSmoothV1(conver12H, view12H + h5PagePlus, 1.64);
                     // 模型打分和统计计算取打分更低的
                     item.getScoreMap().put("cvcvrItemValue", 1.0);
-                    if (smoothCxr1D < calibratedScore) {
-                        calibratedScore = smoothCxr1D;
+                    if (smoothCxr12H < calibratedScore) {
+                        calibratedScore = smoothCxr12H;
                         item.getScoreMap().put("cvcvrItemValue", 2.0);
                     }
                     if (smoothCxr3D < calibratedScore) {