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

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/log/impl/LogHubServiceImpl.java

@@ -136,7 +136,7 @@ public class LogHubServiceImpl implements LogHubService {
                 logMap.put("allfeature", JSON.toJSONString(context.getLogParam().getAllFeature()));
                 logMap.put("metafeature", JSON.toJSONString(context.getLogParam().getMetaFeature()));
                 logMap.put("scoremap", JSON.toJSONString(context.getLogParam().getScoreMap()));
-                logMap.put("isNewUser", context.getLogParam().isBIsNewUser());
+                logMap.put("isnewuser", context.getLogParam().isBIsNewUser());
                 aliyunLogManager.sendLog(project, crowdChooseStatisticsLogStore, "", logMap);
             }
         });

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/impl/PredictModelServiceImpl.java

@@ -165,6 +165,7 @@ public class PredictModelServiceImpl implements PredictModelService {
                 PredictContext context = ConvertUtil.predictParam2Context(requestParam);
                 Map<String, Object> resultMap = predictServiceV2.adPredict(context);
                 logHubService.crowdChooseLogUpload(context);
+                resultMap.put("pqtId", requestParam.getPqtId());
                 return resultMap;
             }
 

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

@@ -106,7 +106,6 @@ public class PredictServiceV2 {
     private Map<String, Object> rtnNoAdPredict(PredictContext context) {
         Map<String, Object> rtnMap = new HashMap<>();
         rtnMap.put("ad_predict", 1);
-        rtnMap.put("pqtid", context.getPqtId());
         rtnMap.put("no_ad_strategy", "713_exp");
         return rtnMap;
     }
@@ -114,7 +113,6 @@ public class PredictServiceV2 {
     private Map<String, Object> rtnAdPredict(PredictContext context) {
         Map<String, Object> rtnMap = new HashMap<>();
         rtnMap.put("ad_predict", 2);
-        rtnMap.put("pqtid", context.getPqtId());
         rtnMap.putAll(context.getLogParam().getScoreMap());
         return rtnMap;
     }