本地演出不够一页 推荐其他演出到一页

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

@@ -120,11 +120,38 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
 
         List<KylinPerformanceVo> list = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
 
+        // 推荐其他地区演出
+        List<KylinPerformanceVo> otherlist = null;
+        int is_native = 1;
+        int recommend = list.size();
+        if (count < size && !cityName.isEmpty()) {
+            /*Document newQueryObject = query.getQueryObject();
+            queryObject.put("cityName", "上海");
+            Query queryOther = new BasicQuery(newQueryObject);*/
+            Query queryOther = new Query();
+
+            String regex = String.format("%s%s%s","^((?!" , cityName , ").)*$");
+            Pattern cityNameCompile = Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
+            queryOther.addCriteria(Criteria.where("cityName").regex(cityNameCompile));
+
+            queryOther.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
+
+            long newSize = size - count;
+            Pageable newPageable = PageRequest.of(0, (int) newSize, sortName);
+            queryOther.with(newPageable);
+
+            otherlist = mongoTemplate.find(queryOther, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
+            if (otherlist.size() > 0) {
+                is_native = 0;
+                list.addAll(otherlist);
+            }
+        }
+
         // 组合数据
+        info.put("is_native", is_native); // 本地演出少是否推荐了其他演出 0有推荐 1没有
+        info.put("recommend", recommend); // 从第几个开始是其他推荐演出 （非后台设置的那个推荐）
         info.put("total", count);
         info.put("list", list);
-        info.put("is_native", 1);
-        info.put("recommend", 0);
 
         return info;
     }

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

@@ -219,7 +219,6 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
             List<BannerDetailsListDao> data = bannersMapper.searchBannersList(BeanUtil.convertBeanToMap(bannersSearchParam));
             return data;
         } catch (Exception e) {
-            System.out.println(e.getMessage());
             return new ArrayList<>();
         }
     }