type6-v0.06

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/otherServices/OtherServicesImpl.java

@@ -120,12 +120,12 @@ public class OtherServicesImpl implements   OtherServicesInterface {
                             //return Mono.just(new StringBuilder(s));
                         }
                         //saveRequest.setImportDomain(String.valueOf(saveRequest.getGroupId()));
-                        return getDomainSetV(groupId, code,2);
+                        return getDomainSetV(groupId, code,2,false);
                     }else {
                         if (3 == ff.type()) {
-                            return getDomainSetV(groupId, code,3);
+                            return getDomainSetV(groupId, code,1,true);
                         }else {
-                            return getDomainSetV(groupId, code,1);
+                            return getDomainSetV(groupId, code,1,false);
                         }
 
                     }
@@ -149,7 +149,7 @@ public class OtherServicesImpl implements   OtherServicesInterface {
                     if (Objects.isNull(groupId)) {
                         return Mono.error(new BaseException("查询裂变计划 groupId 值为 null"));
                     }
-                    return getDomainSetV(groupId, code,1);
+                    return getDomainSetV(groupId, code,1,false);
                 });
     }
 
@@ -176,11 +176,11 @@ public class OtherServicesImpl implements   OtherServicesInterface {
                     }catch (Exception e){
                         return Mono.error(new BaseException("查询听书计划入口域名类型值解析错误"+e.getMessage()));
                     }
-                    return getDomainSetV(groupId, code,1);
+                    return getDomainSetV(groupId, code,1,false);
                 });
     }
 
-    private Mono<ByCodeGetImportDomainRes> getDomainSetV( Long  groupId, String code,Integer type) {
+    private Mono<ByCodeGetImportDomainRes> getDomainSetV( Long  groupId, String code,Integer type,Boolean isFri) {
         return template.select(Query.query(Criteria.where("group_type_id").is(groupId)
                 .and("status").is(1)
                 .and("type").is(type)
@@ -207,7 +207,7 @@ public class OtherServicesImpl implements   OtherServicesInterface {
                         stringBuilder.append(domainSelect.domain());
                         if(2==type){
                             stringBuilder.append("?code=");
-                        }else if(3==type) {
+                        }else if(isFri) {
                             stringBuilder.append("/portal-page/index?code=");
                         }else {
                             stringBuilder.append("/index.html?code=");