假视频 广告 v0.01

launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/planNew/PlanNewCommonOutController.java

@@ -764,8 +764,8 @@ public class PlanNewCommonOutController {
             Mono<List<Ad>> adtop ;
             if (Objects.nonNull(request.getTopAdvBl()) && request.getTopAdvBl()) {
                 if(6==plan.type()){
-                    adtop = template.select(Query.query(Criteria.where("type").is(1) //.and("group_type_id").is(plan.groupId())
-                            .and("deleted_at").isNull()).columns("id,name,type,image,show_beg_at,show_end_at,link".split(",")), Ad.class)
+                    adtop = template.select(Query.query(Criteria.where("type").is(1).and("group_type_id").is(plan.groupId())
+                            .and("deleted_at").isNull()).columns("id,name,type,image,show_beg_at,show_end_at,link,redirect_type,plan_type,plan_id,group_type_id".split(",")), Ad.class)
                             .switchIfEmpty(Mono.error(new BaseException(StrUtil.format("通过计划营销分类：{}；查询顶部广告返回结果为空",plan.groupId()))))
                             .onErrorResume(throwable -> Mono.error(new BaseException(throwable.getMessage()+"4")))
                             .collectList();////广告类型1顶部2底部3返回4安卓，ios的返回
@@ -775,15 +775,14 @@ public class PlanNewCommonOutController {
                             .onErrorResume(throwable -> Mono.error(new BaseException(throwable.getMessage()+"4")))
                             .collectList();////广告类型1顶部2底部3返回4安卓，ios的返回
                 }
-
             }else {
                 adtop=Mono.just(List.of());
             }
             Mono<List<Ad>> adBottom ;
             if (Objects.nonNull(request.getBottomAdvBl()) && request.getBottomAdvBl()) {
                 if (6 == plan.type()) {
-                    adBottom = template.select(Query.query(Criteria.where("type").is(2) //.and("group_type_id").is(plan.groupId())
-                            .and("deleted_at").isNull()).columns("id,name,type,image,show_beg_at,show_end_at,link".split(",")), Ad.class)
+                    adBottom = template.select(Query.query(Criteria.where("type").is(2).and("group_type_id").is(plan.groupId())
+                            .and("deleted_at").isNull()).columns("id,name,type,image,show_beg_at,show_end_at,link,redirect_type,plan_type,plan_id,group_type_id".split(",")), Ad.class)
                             .switchIfEmpty(Mono.error(new BaseException(StrUtil.format("通过计划营销分类：{}；查询底部广告返回结果为空",plan.groupId()))))
                             .onErrorResume(throwable -> Mono.error(new BaseException(throwable.getMessage()+"4")))
                             .collectList();////广告类型1顶部2底部3返回4安卓，ios的返回