Merge branch 'feature_20260605_v563_gate_risk_uid_bug' of algorithm/recommend-server into master

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/RecommendService.java

@@ -435,6 +435,12 @@ public class RecommendService {
             boolean isNoneUserRisk = isNoneUserRisk(request, param);
             boolean hitRiskScene = riskScenes.contains(request.getHotSceneType());
             boolean hitRiskUidCache = riskUserCache.getUnchecked(RedisKeyConstants.Recommend.riskUserUid).contains(param.getUid());
+            // V563 实验补丁: 命中 V563 时, 把 String "null" uid 的命中改回 false,
+            // 修 RickUserCacheJob 将 BIGINT NULL 转 String.valueOf(null)="null" 写入
+            // Redis Set, 导致 client 传 "null" 字符串 uid 的 guest user 全部错杀的 bug.
+            if (hitRiskUidCache && "null".equals(param.getUid()) && isHitV563Exp(request, param)) {
+                hitRiskUidCache = false;
+            }
             boolean hitRiskMidCache = riskUserCache.getUnchecked(RedisKeyConstants.Recommend.riskUserMid).contains(param.getMid());
             boolean riskUser = hitRiskScene || hitRiskUidCache || hitRiskMidCache || isNoneUserRisk;
             param.setRiskUser(riskUser);
@@ -489,6 +495,20 @@ public class RecommendService {
         return param;
     }
 
+    /**
+     * 是否命中 V563 实验 (走 judgeHitAlgoExp, 同时覆盖 abExpCodes 通道和 rootSessionId
+     * 尾号通道). 当前只用于 risk uid 命中里 String "null" 错杀的精准修复.
+     */
+    private static final String V563_EXP_CODE = "563";
+
+    private boolean isHitV563Exp(RecommendRequest request, RecommendParam param) {
+        return experimentService.judgeHitAlgoExp(
+                param.getAppType(),
+                request.getRootSessionId(),
+                param.getAbExpCodes(),
+                V563_EXP_CODE);
+    }
+
     private boolean isNoneUserRisk(RecommendRequest request, RecommendParam param) {
         boolean isNoneUserRisk = false;
         try {
@@ -651,6 +671,7 @@ public class RecommendService {
             ctx.setSubSessionId(Strings.nullToEmpty(request.getSubSessionId()));
             ctx.setRootSessionId(Strings.nullToEmpty(request.getRootSessionId()));
             ctx.setMid(Strings.nullToEmpty(request.getMid()));
+            ctx.setUid(Strings.nullToEmpty(request.getUid()));
             ctx.setAppType(request.getAppType());
             ctx.setNewExpGroup(Strings.nullToEmpty(request.getNewExpGroup()));
             ctx.setHotSceneType(request.getHotSceneType());

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/funnel/FunnelAggregator.java

@@ -30,6 +30,7 @@ public class FunnelAggregator {
         row.put("subSessionId", StringUtils.defaultString(ctx.getSubSessionId()));
         row.put("rootSessionId", StringUtils.defaultString(ctx.getRootSessionId()));
         row.put("mid", StringUtils.defaultString(ctx.getMid()));
+        row.put("uid", StringUtils.defaultString(ctx.getUid()));
         row.put("appType", String.valueOf(ctx.getAppType()));
         row.put("newExpGroup", StringUtils.defaultString(ctx.getNewExpGroup()));
         row.put("abExpCode", JSON.toJSONString(ctx.getAbExpCodes()));

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/funnel/FunnelContext.java

@@ -28,6 +28,7 @@ public class FunnelContext {
     private String subSessionId;
     private String rootSessionId;
     private String mid;
+    private String uid;
     private int    appType;
     private String newExpGroup;
     private Set<String> abExpCodes;