Merge branch 'master' into test

ad-engine-server/src/main/resources/application-pre.yml

@@ -83,7 +83,7 @@ spring:
 
 aliyun:
   log:
-    project: ad-engine
+    project: ad-engine-test
 
 rocketmq:
   accessKey: 736nKkR5Gaq0NAgU

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/container/PidLambdaV2Container.java

@@ -101,14 +101,14 @@ public class PidLambdaV2Container {
                     Double cpa=Double.parseDouble(cols[2]);
                     Double realCost=Double.parseDouble(cols[3]);
                     Double lambdaNew=1d;
-                    if(!((cpa*conversion)==0&&realCost.equals(0d))){
-                        lambdaNew=cpa*conversion/realCost;
+                    if(cpa*conversion!=0&&!realCost.equals(0d)){
+                        lambdaNew=(cpa*conversion)/realCost;
                     }
 
                     if(lambdaNew>maxLambda){
                         lambdaNew=maxLambda;
                     }else if(lambdaNew<minLambda){
-                        lambdaNew=maxLambda;
+                        lambdaNew=minLambda;
                     }
                     temp.put(creativeId,lambdaNew);
 

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

@@ -142,6 +142,7 @@ public class RankServiceImpl implements RankService {
                 item.setCpa(dto.getCpa());
                 item.setPidLambda(PidLambdaContainer.getPidLambda(item.getAdId()));
             }catch (Exception e){
+                log.error("rankItems info error itemId={}",item.getAdId());
                 e.printStackTrace();
             }
         }
@@ -201,7 +202,6 @@ public class RankServiceImpl implements RankService {
         log.info("svc=adBidRank {}", JSONObject.toJSONString(object));
         object.remove("lrsamples");
         log.info("svc=pid_log obj={}", JSONObject.toJSONString(object));
-        log.info("svc=pid_v2_log obj={}", JSONObject.toJSONString(object));
         return result;
     }