|
|
@ -237,7 +237,7 @@ public class CustomerService {
|
|
|
|
content.put("content", welcome.getContent());
|
|
|
|
content.put("content", welcome.getContent());
|
|
|
|
returnValue.put("text", content);
|
|
|
|
returnValue.put("text", content);
|
|
|
|
List<PmnActivityInstanceConfig> configs = pmnActivityInstanceConfigService.list(Wrappers.<PmnActivityInstanceConfig>lambdaQuery().eq(PmnActivityInstanceConfig::getInstanceId, welcome.getId()));
|
|
|
|
List<PmnActivityInstanceConfig> configs = pmnActivityInstanceConfigService.list(Wrappers.<PmnActivityInstanceConfig>lambdaQuery().eq(PmnActivityInstanceConfig::getInstanceId, welcome.getId()));
|
|
|
|
if(configs.size() > 0) {
|
|
|
|
if (configs.size() > 0) {
|
|
|
|
List<PmnActivityPromotionParam> params = pmnActivityPromotionParamService.listByIds(configs.stream().map(PmnActivityInstanceConfig::getParamId).collect(Collectors.toSet()));
|
|
|
|
List<PmnActivityPromotionParam> params = pmnActivityPromotionParamService.listByIds(configs.stream().map(PmnActivityInstanceConfig::getParamId).collect(Collectors.toSet()));
|
|
|
|
for (PmnActivityPromotionParam param : params) {
|
|
|
|
for (PmnActivityPromotionParam param : params) {
|
|
|
|
if (param.getType().equals(1)) {
|
|
|
|
if (param.getType().equals(1)) {
|
|
|
@ -263,6 +263,8 @@ public class CustomerService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|