Просмотр исходного кода

读书计划-v0.08

(cherry picked from commit 90a3641726a0ecd5249e2371bf360414b0d46027)
MOKASZ\lw12420 2 лет назад
Родитель
Сommit
e861a8414b

+ 10 - 10
launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/readBookPlan/ReadBookPlanServicesImpl.java

@@ -409,19 +409,19 @@ public class ReadBookPlanServicesImpl implements ReadBookPlanServicesInterface{
         if (first.isPresent()) {
             Item item = first.get();
             item.setName("客服二维码");
+            Mono<String> url;
             if(item.getIsRandom()){
-                Mono<String> url;
+                //用计划
+                url = byGroupIdGetUrl(Mono.just(plan));
+                return   Mono.zip(Mono.just(item),url).flatMap(f->{
+                    f.getT1().setV(f.getT2());
+                    f.getT1().setName("客服二维码");
+                    return Mono.just(true);
+                });
+            }else {
                 if(item.getIsChannel()){
                     //用客服
                     url = Mono.just(goGenerateService.byCustomerIdGetUrl(request.getChannelCodeId()));
-                  return   Mono.zip(Mono.just(item),url).flatMap(f->{
-                        f.getT1().setV(f.getT2());
-                        f.getT1().setName("客服二维码");
-                        return Mono.just(true);
-                    });
-                }else {
-                    //用计划
-                    url = byGroupIdGetUrl(Mono.just(plan));
                     return   Mono.zip(Mono.just(item),url).flatMap(f->{
                         f.getT1().setV(f.getT2());
                         f.getT1().setName("客服二维码");
@@ -451,7 +451,7 @@ public class ReadBookPlanServicesImpl implements ReadBookPlanServicesInterface{
                         stringBuilder.append("&sk=");
                         stringBuilder.append(IdUtil.fastSimpleUUID());
                     }else {
-                        throw new BaseException("二维码链接:::通过计划id:"+a.id() +"的营销类型查询域名为空");
+                        throw new BaseException("海报 二维码 自动生成匹配链接:::通过计划id:"+a.id() +"的营销类型查询域名为空");
                     }
                     return stringBuilder.toString();
                 })