|
@@ -135,10 +135,6 @@ public class RankServiceImpl implements RankService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- for (AdRankItem rankItem : rankItems) {
|
|
|
- rankItem.setVideoId(request.getVideoId());
|
|
|
- }
|
|
|
-
|
|
|
// 兜底方案
|
|
|
List<AdRankItem> rankResult;
|
|
|
if (inCvrAdjustingExp) {
|
|
@@ -159,7 +155,7 @@ public class RankServiceImpl implements RankService {
|
|
|
object.put("lrsamples",rankResult.get(0).getLrSampleString());
|
|
|
object.put("dataTime",currentTime.format(timeFormatter));
|
|
|
object.put("creativeId",rankResult.get(0).getAdId());
|
|
|
- object.put("videoId", rankResult.get(0).getVideoId());
|
|
|
+ object.put("videoId", request.getVideoId());
|
|
|
log.info("svc=adItemRank {}", JSONObject.toJSONString(object));
|
|
|
object.remove("lrsamples");
|
|
|
if(inCpcPidExp){
|
|
@@ -296,7 +292,6 @@ public class RankServiceImpl implements RankService {
|
|
|
AdPlatformCreativeDTO dto=groupMap.get(item.getAdId()).get(0);
|
|
|
item.setBid1(dto.getBid1());
|
|
|
item.setBid2(dto.getBid2());
|
|
|
- item.setVideoId(request.getVideoId());
|
|
|
lambda=PidLambdaContainer.getPidLambda(item.getAdId());
|
|
|
if(lambda<0){
|
|
|
item.setCpa(dto.getCpa());
|
|
@@ -345,7 +340,6 @@ public class RankServiceImpl implements RankService {
|
|
|
item.setBid1(dto.getBid1());
|
|
|
item.setBid2(dto.getBid2());
|
|
|
item.setAdId(dto.getCreativeId());
|
|
|
- item.setVideoId(request.getVideoId());
|
|
|
item.setItemFeature(new AdItemFeature());
|
|
|
lambda=PidLambdaContainer.getPidLambda(item.getAdId());
|
|
|
if(lambda<0){
|
|
@@ -398,7 +392,7 @@ public class RankServiceImpl implements RankService {
|
|
|
object.put("pcvr",topItem.getCvr());
|
|
|
object.put("lrsamples",topItem.getLrSampleString());
|
|
|
object.put("pidLambda",topItem.getPidLambda());
|
|
|
- object.put("videoId", rankResult.get(0).getVideoId());
|
|
|
+ object.put("videoId", request.getVideoId());
|
|
|
|
|
|
//临时加入供pid v2使用
|
|
|
object.put("realECpm",realECpm);
|
|
@@ -448,7 +442,6 @@ public class RankServiceImpl implements RankService {
|
|
|
AdPlatformCreativeDTO dto=groupMap.get(item.getAdId()).get(0);
|
|
|
item.setBid1(dto.getBid1());
|
|
|
item.setBid2(dto.getBid2());
|
|
|
- item.setVideoId(request.getVideoId());
|
|
|
lambda=PidLambdaV2Container.getPidLambda(item.getAdId());
|
|
|
if(lambda<0){
|
|
|
item.setCpa(dto.getCpa());
|
|
@@ -474,7 +467,6 @@ public class RankServiceImpl implements RankService {
|
|
|
item.setBid1(dto.getBid1());
|
|
|
item.setBid2(dto.getBid2());
|
|
|
item.setAdId(dto.getCreativeId());
|
|
|
- item.setVideoId(request.getVideoId());
|
|
|
item.setItemFeature(new AdItemFeature());
|
|
|
lambda=PidLambdaV2Container.getPidLambda(item.getAdId());
|
|
|
|
|
@@ -527,7 +519,7 @@ public class RankServiceImpl implements RankService {
|
|
|
object.put("pidLambda",topItem.getPidLambda());
|
|
|
object.put("realECpm",realECpm);
|
|
|
object.put("creativeId",result.getCreativeId());
|
|
|
- object.put("videoId", rankResult.get(0).getVideoId());
|
|
|
+ object.put("videoId", request.getVideoId());
|
|
|
//CPA还原
|
|
|
object.put("cpa",dto.getCpa()*dto.getBid1());
|
|
|
object.put("oCpa",dto.getCpa());
|