gufengshou1 před 1 rokem
rodič
revize
235e244a87

+ 39 - 16
ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/impl/RankServiceImpl.java

@@ -178,7 +178,7 @@ public class RankServiceImpl implements RankService {
                 lambda=PidLambdaContainer.getPidLambda(item.getAdId());
                 if(lambda<0){
                     item.setCpa(dto.getCpa());
-                    item.setPidLambda(dto.getCpa());
+                    item.setPidLambda(dto.getCpa()*0.6);
                 }else {
                     if(dto.getCpa()>1&&lambda<=1){
                         lambda=2d;
@@ -212,16 +212,15 @@ public class RankServiceImpl implements RankService {
 //                    item.setCpa(lambda);
 //                    item.setPidLambda(1d);
 //                }
-
-               if(lambda<0){
+                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);
                 }
 //                item.setCpa(dto.getCpa());
 //                item.setPidLambda(PidLambdaContainer.getPidLambda(item.getAdId()));
@@ -245,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.getEcpm1();
+        realECpm=topItem.getEcpm2();
 
         if(realECpm>cpmMax/1000d){
             realECpm=cpmMax/1000d;
@@ -268,7 +268,8 @@ public class RankServiceImpl implements RankService {
         object.put("realECpm",realECpm);
         object.put("creativeId",result.getCreativeId());
         //CPA还原
-        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");
@@ -312,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);
+//                }else {
+//                    if(dto.getCpa()>1&&lambda<=1){
+//                        lambda=2d;
+//                    }
+//                    item.setCpa(lambda);
+//                    item.setPidLambda(1d);
+//                }
                 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){
@@ -338,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);
+//                }else {
+//                    if(dto.getCpa()>1&&lambda<=1){
+//                        lambda=2d;
+//                    }
+//                    item.setCpa(lambda);
+//                    item.setPidLambda(1d);
+//                }
                 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);
                 }
 //                item.setCpa(dto.getCpa());
 //                item.setPidLambda(PidLambdaContainer.getPidLambda(item.getAdId()));
@@ -369,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.getEcpm1();
+        realECpm=topItem.getEcpm2();
 
         if(realECpm>cpmMax/1000d){
             realECpm=cpmMax/1000d;
@@ -392,7 +414,8 @@ public class RankServiceImpl implements RankService {
         object.put("realECpm",realECpm);
         object.put("creativeId",result.getCreativeId());
         //CPA还原
-        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");