Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/recommend/add.html

@@ -47,7 +47,7 @@
 
     function getPerformanceTitle() {
         var testBsSuggest = $("#suggest-demo-2").bsSuggest({
-            url: prefix + "/performance/status?status=(3,6,7)&title=" + document.getElementById("suggest-demo-2").value,
+            url: prefix + "/performance/status?status=(3,6,7,9,10)&title=" + document.getElementById("suggest-demo-2").value,
             showBtn: false,
             idField: "performancesId",
             keyField: "title"
@@ -59,4 +59,4 @@
     }
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/roadShow/addPerformances.html

@@ -45,16 +45,16 @@
 
     function getPerformanceTitle() {
         var testBsSuggest = $("#suggest-demo-2").bsSuggest({
-            url: prefix + "/performance/status?status=(3,6,7)&title=" + document.getElementById("suggest-demo-2").value,
+            url: prefix + "/performance/status?status=(3,6,7,9,10)&title=" + document.getElementById("suggest-demo-2").value,
             showBtn: false,
             idField: "performancesId",
             keyField: "title"
         }).on('onDataRequestSuccess', function (e, result) {
         }).on('onSetSelectValue', function (e, keyword) {
-            document.getElementsByName("ids")[0].value=keyword.id;
+            document.getElementsByName("ids")[0].value = keyword.id;
         }).on('onUnsetSelectValue', function (e) {
         });
     }
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -25,6 +25,7 @@ import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -81,23 +82,31 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
             }
         }
 
+//        List<String> ids = Arrays.asList("");
+
         // 推荐
         int is_native = 1;
         int recommend = performancesListNew.size();
+        List<KylinPerformanceVo> performancesListNewUnqui = new ArrayList<>();
+        performancesListNewUnqui.addAll(performancesListNew);
         if (recommend <= 2) {
             List<KylinPerformanceVo> performancesListRecommend = dataUtils.getPerformancesListIsSystemRecommend();
-            if (performancesListRecommend.size() > 0) {
+
+            /*List<KylinPerformanceVo> collect = performancesListRecommend.stream().filter(r -> !ids.contains(r.getPerformancesId())).collect(Collectors.toList());
+            performancesListNew.addAll(collect);*/
+
+            if (CollectionUtils.isEmpty(performancesListRecommend)) {
                 is_native = 0;
                 if(recommend > 0) {// 去重
                     for(KylinPerformanceVo recommendInfo : performancesListRecommend) {
                         for(KylinPerformanceVo info : performancesListNew) {
-                            if (!recommendInfo.getPerformancesId().equalsIgnoreCase(info.getPerformancesId())) {
-                                performancesListNew.add(recommendInfo);
+                            if (!recommendInfo.getPerformancesId().equals(info.getPerformancesId())) {
+                                performancesListNewUnqui.add(recommendInfo);
                             }
                         }
                     }
                 } else {
-                    performancesListNew.addAll(performancesListRecommend);
+                    performancesListNewUnqui.addAll(performancesListRecommend);
                 }
             }
         }
@@ -107,7 +116,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         info.put("is_native", is_native); // 本地演出少是否推荐了其他演出 0有推荐 1没有
         info.put("recommend", recommend); // 从第几个开始是其他推荐演出 后台设置的那个推荐
         info.put("total", 0);
-        info.put("list", performancesListNew);
+        info.put("list", performancesListNewUnqui);
 
         return info;
     }