自定义二维码 计划兼容v-3

(cherry picked from commit 2186eaf88314854df5fdec56544d1f5848fcfb1c)

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/listening/ListeningPlanServiceImpl.java

@@ -649,11 +649,11 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
                 }
             }
             List<StringBuilder> t4 = f.getT4();
-            if (Objects.nonNull(t4) && !t4.isEmpty()) {
-                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("H5二维码"));
-            }else{
-                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("客服二维码"));
-            }
+//            if (Objects.nonNull(t4) && !t4.isEmpty()) {
+//                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("H5二维码"));
+//            }else{
+//                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("客服二维码"));
+//            }
             Optional<Item> first2 = goRequest
                     .getItem()
                     .stream()
@@ -951,11 +951,11 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
                                                         Mono<List<Material>> title) {
         Mono<String> stringMono = Mono.zip(bgImage, images, text, stringBuilderMono,coverFm,getQrcode(saveRequest),title).flatMap(f -> {
             List<StringBuilder> t4 = f.getT4();//自定义二维码
-            if (Objects.nonNull(t4) && !t4.isEmpty()) {
-                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("H5二维码"));
-            }else{
-                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("客服二维码"));
-            }
+//            if (Objects.nonNull(t4) && !t4.isEmpty()) {
+//                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("H5二维码"));
+//            }else{
+//                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("客服二维码"));
+//            }
 
             Optional<Item> first2 = goRequest.getItem().stream().filter(fc -> "cusqrcode".equals(fc.getT()) && (Objects.isNull(fc.getV()) || "".equals(fc.getV()))).findFirst();
             if (first2.isPresent()) {

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/planNew/goGenerate/GoGenerateService.java

@@ -397,11 +397,11 @@ public class GoGenerateService {
 //                        .ifPresent(item -> {item.setV(material.content());}));
 //            }
             List<StringBuilder> t4 = f.getT4();
-            if (Objects.nonNull(t4) && !t4.isEmpty()) {
-                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("H5二维码"));
-            }else{
-                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("客服二维码"));
-            }
+//            if (Objects.nonNull(t4) && !t4.isEmpty()) {
+//                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("H5二维码"));
+//            }else{
+//                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("客服二维码"));
+//            }
             Optional<Item> first2 = goRequest.getItem().stream().filter(fc -> "cusqrcode".equals(fc.getT()) && (Objects.isNull(fc.getV()) || "".equals(fc.getV()))).findFirst();
             if (first2.isPresent()) {
                 throw new BaseException("自定义二维码素材为空");
@@ -557,13 +557,13 @@ public class GoGenerateService {
                                          Mono<List<Image>> bgImage, Mono<List<Image>> fmImage, Mono<List<Material>> text,Mono<List<Image>> fm1,
                                                         ServiceGroupSettingItemRequest qsSetting,PlanReq saveRequest,Mono<List<Material>> title) {
 
-        Mono<String> stringMono = Mono.zip(bgImage, fmImage, text, stringBuilderMono,fm1,getStringBuilderMono(saveRequest),title).flatMap(f -> {
+        Mono<String> stringMono = Mono.zip(bgImage, fmImage, text, stringBuilderMono,fm1,getImportDomain(saveRequest),title).flatMap(f -> {
             List<StringBuilder> t4 = f.getT4();
-            if (Objects.nonNull(t4) && !t4.isEmpty()) {
-                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("H5二维码"));
-            }else{
-                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("客服二维码"));
-            }
+//            if (Objects.nonNull(t4) && !t4.isEmpty()) {
+//                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("H5二维码"));
+//            }else{
+//                goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("客服二维码"));
+//            }
             Optional<Item> first2 = goRequest.getItem().stream().filter(fc -> "cusqrcode".equals(fc.getT()) && (Objects.isNull(fc.getV()) || "".equals(fc.getV()))).findFirst();
             if (first2.isPresent()) {
                 throw new BaseException("自定义二维码素材为空");