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

@@ -480,9 +480,14 @@ public class RankStrategyBy688 extends RankStrategyBasic {
             List<String> converList = new ArrayList<>();
             for (TupleMapEntry<Tuple5> tupleMapEntry : midActionList) {
                 String cid = tupleMapEntry.key;
+                String click = tupleMapEntry.value.f2;
                 String conver = tupleMapEntry.value.f3;
-                cidList.add(cid);
-                converList.add(conver);
+                if (Objects.equals(click, "1")) {
+                    cidList.add(cid);
+                }
+                if (Objects.equals(conver, "1")) {
+                    converList.add(conver);
+                }
             }
             featureMap.put("user_cid_click_list", String.join(",", cidList));
             featureMap.put("user_cid_conver_list", String.join(",", converList));