|
@@ -522,10 +522,8 @@ public class PlanNewOutController {
|
|
|
map.put(request.getUnique(),0);
|
|
map.put(request.getUnique(),0);
|
|
|
request.setUserVisits(0);
|
|
request.setUserVisits(0);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
Mono<PlanNew> code0 = template.selectOne(Query.query(Criteria.where("code").is(request.getCode())), PlanNew.class)
|
|
Mono<PlanNew> code0 = template.selectOne(Query.query(Criteria.where("code").is(request.getCode())), PlanNew.class)
|
|
|
.switchIfEmpty(Mono.error(new BaseException(" code错误")))
|
|
.switchIfEmpty(Mono.error(new BaseException(" code错误")))
|
|
|
-
|
|
|
|
|
.onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage())));
|
|
.onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage())));
|
|
|
Mono<DataLists0> dataLists0Mono = code0.flatMap(ftmp->{
|
|
Mono<DataLists0> dataLists0Mono = code0.flatMap(ftmp->{
|
|
|
//(如果wx_user_id值不为空则使用清水分类)
|
|
//(如果wx_user_id值不为空则使用清水分类)
|
|
@@ -542,6 +540,7 @@ public class PlanNewOutController {
|
|
|
dataLists0.setSpare(f.getT5().toString());
|
|
dataLists0.setSpare(f.getT5().toString());
|
|
|
dataLists0.setRedirectType(f.getT1().redirectType());
|
|
dataLists0.setRedirectType(f.getT1().redirectType());
|
|
|
dataLists0.setPlanNew(f.getT1());
|
|
dataLists0.setPlanNew(f.getT1());
|
|
|
|
|
+ dataLists0.setGroupListDisplay(f.getT1().groupListDisplay());
|
|
|
dataLists0.setPosterTemplate(f.getT2());
|
|
dataLists0.setPosterTemplate(f.getT2());
|
|
|
List<Poster> t3 = f.getT3();
|
|
List<Poster> t3 = f.getT3();
|
|
|
if(t3.size()!=0){
|
|
if(t3.size()!=0){
|
|
@@ -622,6 +621,14 @@ public class PlanNewOutController {
|
|
|
PlanNewBackgroupPoster fxSetting = fm.getFxSetting();
|
|
PlanNewBackgroupPoster fxSetting = fm.getFxSetting();
|
|
|
goRequest = setNameVal(posterTemplate, fxSetting,fm.getSpare());
|
|
goRequest = setNameVal(posterTemplate, fxSetting,fm.getSpare());
|
|
|
}
|
|
}
|
|
|
|
|
+ if (Objects.nonNull(goRequest) && Objects.nonNull(goRequest.getItem())) {
|
|
|
|
|
+ Optional<Item> first = goRequest.getItem().stream()
|
|
|
|
|
+ .filter(ff -> "title".equals(ff.getT()) && ff.getIsRandom())
|
|
|
|
|
+ .findFirst();
|
|
|
|
|
+ first.ifPresent(item -> fm.setGroupTitle(item.getV()));
|
|
|
|
|
+ Optional<Item> first1 = goRequest.getItem().stream().filter(ff -> "cover".equals(ff.getT()) && ff.getIsRandom()).findFirst();
|
|
|
|
|
+ first1.ifPresent(item -> fm.setGroupHeadUrl(item.getV()));
|
|
|
|
|
+ }
|
|
|
String ret;
|
|
String ret;
|
|
|
if (Objects.nonNull(goRequest)) {
|
|
if (Objects.nonNull(goRequest)) {
|
|
|
ret = goGenerateService.goGenerate(JSONUtil.toJsonStr(goRequest));
|
|
ret = goGenerateService.goGenerate(JSONUtil.toJsonStr(goRequest));
|
|
@@ -671,6 +678,7 @@ public class PlanNewOutController {
|
|
|
//JSONObject jsonObject = JSONUtil.parseObj(posterTemplate);
|
|
//JSONObject jsonObject = JSONUtil.parseObj(posterTemplate);
|
|
|
GoRequest goRequest = new GoRequest();
|
|
GoRequest goRequest = new GoRequest();
|
|
|
BeanUtil.copyProperties(jsonObject, goRequest);
|
|
BeanUtil.copyProperties(jsonObject, goRequest);
|
|
|
|
|
+
|
|
|
Mono<String> outTemPoster;
|
|
Mono<String> outTemPoster;
|
|
|
if (Objects.nonNull(request.getWx_user_id()) && !"".equals(request.getWx_user_id())) {
|
|
if (Objects.nonNull(request.getWx_user_id()) && !"".equals(request.getWx_user_id())) {
|
|
|
Long aLong = fm.getPlanNew().groupIdQs();
|
|
Long aLong = fm.getPlanNew().groupIdQs();
|