Merge branch 'feature_gufengshou_20240513_pid_v7'

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

@@ -93,19 +93,6 @@ public class RankServiceImpl implements RankService {
         }
         double lambda=-1d;
         if(inCpcPidExp){
-            for(AdRankItem item:rankItems){
-                try {
-                    AdPlatformCreativeDTO dto=groupMap.get(item.getAdId()).get(0);
-                    item.setBid1(dto.getBid1());
-                    item.setBid2(dto.getBid2());
-                    item.setCpa(dto.getCpa());
-                    item.setPidLambda(1d);
-                }catch (Exception e){
-                    log.error("rankItems info error itemId={}",item.getAdId());
-                    e.printStackTrace();
-                }
-            }
-        }else {
             for(AdRankItem item:rankItems){
                 try {
                     AdPlatformCreativeDTO dto=groupMap.get(item.getAdId()).get(0);
@@ -122,6 +109,17 @@ public class RankServiceImpl implements RankService {
                         item.setCpa(lambda);
                         item.setPidLambda(1d);
                     }
+                }catch (Exception e){
+                    log.error("rankItems info error itemId={}",item.getAdId());
+                    e.printStackTrace();
+                }
+            }
+        }else {
+            for(AdRankItem item:rankItems){
+                try {
+                    AdPlatformCreativeDTO dto=groupMap.get(item.getAdId()).get(0);
+                    item.setBid1(dto.getBid1());
+                    item.setBid2(dto.getBid2());
                     item.setCpa(dto.getCpa());
                     item.setPidLambda(1d);
                 }catch (Exception e){