feat: 相册裂变底部广告

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

@@ -927,7 +927,8 @@ public class PlanNewCommonOutController {
             }
             Mono<List<Ad>> adBottom ;
             if (Objects.nonNull(request.getBottomAdvBl()) && request.getBottomAdvBl()) {
-                if (6 == plan.type()) {
+                //假视频，相册
+                if (Set.of(6,7).contains(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,redirect_type,plan_type,plan_id,group_type_id".split(",")), Ad.class)
                             .switchIfEmpty(Mono.error(new BaseException(StrUtil.format("通过计划营销分类：{}；查询底部广告返回结果为空",plan.groupId()))))

launch-admin/src/test/java/com/webflux/launchadmin/LaunchAdminApplicationTests.java

@@ -1,10 +1,18 @@
 package com.webflux.launchadmin;
 
-
-import com.plumelog.core.util.LogExceptionStackTrace;
+import com.alibaba.fastjson.JSON;
+import com.webflux.launchadmin.mysql.controller.planNew.PlanNewCommonOutController;
+import com.webflux.launchadmin.mysql.controller.planNew.req.PlanNewCommonMaterialReq;
+import com.webflux.launchadmin.mysql.controller.planNew.res.PlanNewCommonMaterialRes;
+import com.webflux.launchadmin.mysql.entity.planNew.DomainSelect;
+import com.webflux.launchcommon.returnObj.RStatus;
+import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import reactor.core.publisher.Mono;
+
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpHeaders;
@@ -13,6 +21,20 @@ import java.net.http.HttpResponse;
 
 @SpringBootTest
 class LaunchAdminApplicationTests {
+    
+    @Autowired
+    private PlanNewCommonOutController  planNewCommonOutController;
+    
+    @Test
+    public void testGetCommon() {
+        PlanNewCommonMaterialReq req = new PlanNewCommonMaterialReq();
+        req.setCode("lmyquu");
+        req.setAlbumNum(6);
+        req.setBottomAdvBl(true);
+        req.setReturnLoopId(10L);
+        Mono<RStatus<PlanNewCommonMaterialRes>> commonMaterial = planNewCommonOutController.getCommonMaterial(req);
+        commonMaterial.subscribe();
+    }
 
     @Test
     public void te() {
@@ -40,8 +62,8 @@ class LaunchAdminApplicationTests {
     @Test
     public void testLog() {
         String val = "123abc";
-        Mono.just(val).flatMap(f -> Mono.just(Integer.parseInt(f)))
-                .onErrorResume(e -> Mono.error(new Exception(LogExceptionStackTrace.erroStackTrace(e).toString())))
-                .subscribe(System.out::println);
+        Integer num = Integer.parseInt(val);
+        System.out.println(num);
     }
+
 }