|
@@ -146,6 +146,29 @@ public class RankServiceImpl implements RankService {
|
|
|
rankItems=new LinkedList<>(cache.values());
|
|
|
}
|
|
|
double lambda=-1d;
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
for(AdRankItem item:rankItems){
|
|
|
try {
|
|
|
|
|
@@ -155,13 +178,13 @@ public class RankServiceImpl implements RankService {
|
|
|
lambda=PidLambdaContainer.getPidLambda(item.getAdId());
|
|
|
if(lambda<0){
|
|
|
item.setCpa(dto.getCpa());
|
|
|
- item.setPidLambda(0.6);
|
|
|
+ item.setPidLambda(dto.getCpa()*0.6);
|
|
|
}else {
|
|
|
if(dto.getCpa()>1&&lambda<=1){
|
|
|
lambda=2d;
|
|
|
}
|
|
|
- item.setCpa(lambda);
|
|
|
- item.setPidLambda(1d);
|
|
|
+ item.setCpa(dto.getCpa());
|
|
|
+ item.setPidLambda(lambda);
|
|
|
}
|
|
|
|
|
|
}catch (Exception e){
|
|
@@ -179,15 +202,25 @@ public class RankServiceImpl implements RankService {
|
|
|
item.setAdId(dto.getCreativeId());
|
|
|
item.setItemFeature(new AdItemFeature());
|
|
|
lambda=PidLambdaContainer.getPidLambda(item.getAdId());
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
if(lambda<0){
|
|
|
item.setCpa(dto.getCpa());
|
|
|
- item.setPidLambda(0.6);
|
|
|
+ item.setPidLambda(dto.getCpa()*0.6);
|
|
|
}else {
|
|
|
if(dto.getCpa()>1&&lambda<=1){
|
|
|
lambda=2d;
|
|
|
}
|
|
|
- item.setCpa(lambda);
|
|
|
- item.setPidLambda(1d);
|
|
|
+ item.setCpa(dto.getCpa());
|
|
|
+ item.setPidLambda(lambda);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -211,7 +244,8 @@ public class RankServiceImpl implements RankService {
|
|
|
result.setCreativeCode(groupMap.get(topItem.getAdId()).get(0).getCreativeCode());
|
|
|
double realECpm=0d;
|
|
|
|
|
|
- realECpm=topItem.getEcpm1();
|
|
|
+
|
|
|
+ realECpm=topItem.getEcpm2();
|
|
|
|
|
|
if(realECpm>cpmMax/1000d){
|
|
|
realECpm=cpmMax/1000d;
|
|
@@ -234,7 +268,8 @@ public class RankServiceImpl implements RankService {
|
|
|
object.put("realECpm",realECpm);
|
|
|
object.put("creativeId",result.getCreativeId());
|
|
|
|
|
|
- object.put("cpa",dto.getCpa());
|
|
|
+ object.put("cpa",dto.getCpa()*dto.getBid1());
|
|
|
+ object.put("oCpa",dto.getCpa());
|
|
|
object.put("dataTime",currentTime.format(timeFormatter));
|
|
|
log.info("svc=adBidRank {}", JSONObject.toJSONString(object));
|
|
|
object.remove("lrsamples");
|
|
@@ -278,15 +313,25 @@ public class RankServiceImpl implements RankService {
|
|
|
item.setBid1(dto.getBid1());
|
|
|
item.setBid2(dto.getBid2());
|
|
|
lambda=PidLambdaV2Container.getPidLambda(item.getAdId());
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
if(lambda<0){
|
|
|
item.setCpa(dto.getCpa());
|
|
|
- item.setPidLambda(0.6);
|
|
|
+ item.setPidLambda(dto.getCpa()*0.6);
|
|
|
}else {
|
|
|
if(dto.getCpa()>1&&lambda<=1){
|
|
|
lambda=2d;
|
|
|
}
|
|
|
- item.setCpa(lambda);
|
|
|
- item.setPidLambda(1d);
|
|
|
+ item.setCpa(dto.getCpa());
|
|
|
+ item.setPidLambda(lambda);
|
|
|
}
|
|
|
|
|
|
}catch (Exception e){
|
|
@@ -304,15 +349,25 @@ public class RankServiceImpl implements RankService {
|
|
|
item.setAdId(dto.getCreativeId());
|
|
|
item.setItemFeature(new AdItemFeature());
|
|
|
lambda=PidLambdaV2Container.getPidLambda(item.getAdId());
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
if(lambda<0){
|
|
|
item.setCpa(dto.getCpa());
|
|
|
- item.setPidLambda(0.6);
|
|
|
+ item.setPidLambda(dto.getCpa()*0.6);
|
|
|
}else {
|
|
|
if(dto.getCpa()>1&&lambda<=1){
|
|
|
lambda=2d;
|
|
|
}
|
|
|
- item.setCpa(lambda);
|
|
|
- item.setPidLambda(1d);
|
|
|
+ item.setCpa(dto.getCpa());
|
|
|
+ item.setPidLambda(lambda);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -335,7 +390,8 @@ public class RankServiceImpl implements RankService {
|
|
|
result.setCreativeCode(groupMap.get(topItem.getAdId()).get(0).getCreativeCode());
|
|
|
double realECpm=0d;
|
|
|
|
|
|
- realECpm=topItem.getEcpm1();
|
|
|
+
|
|
|
+ realECpm=topItem.getEcpm2();
|
|
|
|
|
|
if(realECpm>cpmMax/1000d){
|
|
|
realECpm=cpmMax/1000d;
|
|
@@ -358,7 +414,8 @@ public class RankServiceImpl implements RankService {
|
|
|
object.put("realECpm",realECpm);
|
|
|
object.put("creativeId",result.getCreativeId());
|
|
|
|
|
|
- object.put("cpa",dto.getCpa());
|
|
|
+ object.put("cpa",dto.getCpa()*dto.getBid1());
|
|
|
+ object.put("oCpa",dto.getCpa());
|
|
|
object.put("dataTime",currentTime.format(timeFormatter));
|
|
|
log.info("svc=adBidRankNewPid {}", JSONObject.toJSONString(object));
|
|
|
object.remove("lrsamples");
|