|
@@ -319,7 +319,7 @@ public class GoodsDonController {
|
|
|
if (o == null) {
|
|
if (o == null) {
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
if (filterGoodsIds) {
|
|
if (filterGoodsIds) {
|
|
|
- builder.field(GoodsFrontListView::getIsFilter, Boolean.FALSE);
|
|
|
|
|
|
|
+ builder.field(GoodsFrontListView::getFilter, Boolean.FALSE);
|
|
|
}
|
|
}
|
|
|
list = beanSearcher.searchAll(GoodsFrontListView.class, builder.build());
|
|
list = beanSearcher.searchAll(GoodsFrontListView.class, builder.build());
|
|
|
redisService.setNx(h5CacheKey, list, RedisService.key.YH_HOME_PAGHE_CACHE.getTimeout());
|
|
redisService.setNx(h5CacheKey, list, RedisService.key.YH_HOME_PAGHE_CACHE.getTimeout());
|
|
@@ -660,7 +660,7 @@ public class GoodsDonController {
|
|
|
if (type == HomeManagementConfig.Type.ex || type == HomeManagementConfig.Type.vg) {
|
|
if (type == HomeManagementConfig.Type.ex || type == HomeManagementConfig.Type.vg) {
|
|
|
builder.put("condition", conditionSql);
|
|
builder.put("condition", conditionSql);
|
|
|
if (isFilterGoodsIds) {
|
|
if (isFilterGoodsIds) {
|
|
|
- builder.field(HomeManagementFrontView::getIsFilter, Boolean.FALSE);
|
|
|
|
|
|
|
+ builder.field(HomeManagementFrontView::getFilter, Boolean.FALSE);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
List<HomeManagementFrontView> homeManagementFrontViews = beanSearcher.searchAll(HomeManagementFrontView.class, builder.build());
|
|
List<HomeManagementFrontView> homeManagementFrontViews = beanSearcher.searchAll(HomeManagementFrontView.class, builder.build());
|
|
@@ -1130,7 +1130,7 @@ public class GoodsDonController {
|
|
|
}
|
|
}
|
|
|
if (isFilterGoodsIds) {
|
|
if (isFilterGoodsIds) {
|
|
|
//特殊ip需要过滤的商品
|
|
//特殊ip需要过滤的商品
|
|
|
- mapBuilder.field(GoodsFrontListCategoryView::getIsFilter, Boolean.FALSE);
|
|
|
|
|
|
|
+ mapBuilder.field(GoodsFrontListCategoryView::getFilter, Boolean.FALSE);
|
|
|
}
|
|
}
|
|
|
List<GoodsFrontListCategoryView> goodsFrontListViews = beanSearcher.searchAll(GoodsFrontListCategoryView.class, mapBuilder.build());
|
|
List<GoodsFrontListCategoryView> goodsFrontListViews = beanSearcher.searchAll(GoodsFrontListCategoryView.class, mapBuilder.build());
|
|
|
List<Long> gptBuyGids = getGptMirrorGiveawayBuyGids();
|
|
List<Long> gptBuyGids = getGptMirrorGiveawayBuyGids();
|
|
@@ -1358,7 +1358,7 @@ public class GoodsDonController {
|
|
|
if (o == null) {
|
|
if (o == null) {
|
|
|
MapBuilder builder = MapUtils.builder();
|
|
MapBuilder builder = MapUtils.builder();
|
|
|
if (filterGoodsIds) {
|
|
if (filterGoodsIds) {
|
|
|
- builder.field(GoodsDonSkuSubsidyFrontView::getIsFilter, Boolean.FALSE);
|
|
|
|
|
|
|
+ builder.field(GoodsDonSkuSubsidyFrontView::getFilter, Boolean.FALSE);
|
|
|
}
|
|
}
|
|
|
List<GoodsDonSkuSubsidyFrontView> subsidyList = beanSearcher.searchAll(GoodsDonSkuSubsidyFrontView.class, builder.build());
|
|
List<GoodsDonSkuSubsidyFrontView> subsidyList = beanSearcher.searchAll(GoodsDonSkuSubsidyFrontView.class, builder.build());
|
|
|
subsidyList.forEach(e -> {
|
|
subsidyList.forEach(e -> {
|