Merge branch 'master' into pre-master

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);