Merge branch 'dev-xym-fix' of algorithm/ad-engine into master

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/strategy/RankStrategyBy688.java

@@ -476,21 +476,21 @@ public class RankStrategyBy688 extends RankStrategyBasic {
         featureMap.put("cvr_all", String.valueOf(NumUtil.div(clickAll, converAll)));
         featureMap.put("ecpm_all", String.valueOf(NumUtil.div(incomeAll * 1000, viewAll)));
         if (CollectionUtils.isNotEmpty(midActionList)) {
-            List<String> cidList = new ArrayList<>();
-            List<String> converList = new ArrayList<>();
+            List<String> cidClickList = new ArrayList<>();
+            List<String> cidConverList = new ArrayList<>();
             for (TupleMapEntry<Tuple5> tupleMapEntry : midActionList) {
                 String cid = tupleMapEntry.key;
                 String click = tupleMapEntry.value.f2;
                 String conver = tupleMapEntry.value.f3;
                 if (Objects.equals(click, "1")) {
-                    cidList.add(cid);
+                    cidClickList.add(cid);
                 }
                 if (Objects.equals(conver, "1")) {
-                    converList.add(conver);
+                    cidConverList.add(cid);
                 }
             }
-            featureMap.put("user_cid_click_list", String.join(",", cidList));
-            featureMap.put("user_cid_conver_list", String.join(",", converList));
+            featureMap.put("user_cid_click_list", String.join(",", cidClickList));
+            featureMap.put("user_cid_conver_list", String.join(",", cidConverList));
         }
         return midActionList;
     }