|
|
@@ -218,6 +218,11 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
|
|
|
}
|
|
|
}
|
|
|
if (ObjectUtil.isNotEmpty(vo.getAnswers())){
|
|
|
+ vo.getAnswers().forEach(answerVO -> {
|
|
|
+ if(answerVO.getFlag() == null) {
|
|
|
+ answerVO.setFlag(false);
|
|
|
+ }
|
|
|
+ });
|
|
|
//有值且为true排前面
|
|
|
List<AnswerVO> collect = vo.getAnswers().stream()
|
|
|
.sorted(Comparator.comparing(AnswerVO::getValue, Comparator.nullsFirst(Integer::compareTo)).reversed()).collect(Collectors.toList())
|
|
|
@@ -245,6 +250,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
|
|
|
|
|
|
@Override
|
|
|
public R getWxaCodePackageOrderUnLimit(Long collectionId) {
|
|
|
+ logger.info("生成用户信息采集二维码");
|
|
|
FsSysConfig sysConfig = configUtil.getSysConfig();
|
|
|
|
|
|
final WxMaService wxMaService = WxMaConfiguration.getMaService(sysConfig.getAppid());
|
|
|
@@ -256,7 +262,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
|
|
|
scene,
|
|
|
"pages_order/confirmUserinfo",
|
|
|
true,
|
|
|
- "release",
|
|
|
+ "trial",//release trial
|
|
|
430,
|
|
|
true,
|
|
|
null,
|