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

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/v2/RootSessionIdPredict.java

@@ -46,33 +46,37 @@ public class RootSessionIdPredict extends BasicPredict {
                     threshold = item.getConfig().getOrDefault("threshold", 0d);
                 }
 
+                Map<String, Object> returnMap = new HashMap<>();
+
                 if (score < threshold) {
-                    Map<String, Object> returnMap = rtnAdPredict(ctx);
-                    returnMap.put("score", score);
-                    returnMap.put("threshold", threshold);
+                    returnMap.putAll(rtnAdPredict(ctx));
                     returnMap.put("model", "rootSessionIdTailModel");
+                } else {
+                    returnMap.putAll(rtnNoAdPredict(ctx));
+                    returnMap.put("no_ad_strategy", "rootSessionIdTailModel");
+                }
 
-                    JSONObject logJson = new JSONObject();
-                    logJson.putAll(returnMap);
-                    logJson.put("mid", ctx.getMid());
-                    logJson.put("appType", appType);
-                    logJson.put("rootSessionIdTail", tail);
-                    logJson.put("shareType", shareType);
+                returnMap.put("score", score);
+                returnMap.put("threshold", threshold);
 
-                    logJson.put("expId", "rootSessionIdTailExp");
-                    logJson.put("thresholdParamKey", shareType);
-                    logJson.put("adPlatformType", ctx.getAdPlatformType());
-                    logJson.put("abCode", ctx.getAdAbCode());
-                    logJson.put("extraParam", ctx.getExpConfigMap());
-                    logJson.put("configItem", item);
+                JSONObject logJson = new JSONObject();
+                logJson.putAll(returnMap);
+                logJson.put("mid", ctx.getMid());
+                logJson.put("appType", appType);
+                logJson.put("rootSessionIdTail", tail);
+                logJson.put("shareType", shareType);
 
-                    log.info("广告跳出选择 -- rootSessionId尾号实验结果: {}, 参数: {}",
-                            JSONUtils.toJson(returnMap), logJson.toJSONString());
+                logJson.put("expId", "rootSessionIdTailExp");
+                logJson.put("thresholdParamKey", shareType);
+                logJson.put("adPlatformType", ctx.getAdPlatformType());
+                logJson.put("abCode", ctx.getAdAbCode());
+                logJson.put("extraParam", ctx.getExpConfigMap());
+                logJson.put("configItem", item);
 
-                    return returnMap;
-                } else {
-                    return rtnNoAdPredict(ctx);
-                }
+                log.info("广告跳出选择 -- rootSessionId尾号实验结果: {}, 参数: {}",
+                        JSONUtils.toJson(returnMap), logJson.toJSONString());
+
+                return returnMap;
             }
         }