Commit 8c93513f by 田超

Merge branch 'fixbug/1003584-1' into 'master'

bug: [none] 解决无法获取渠道对应accountSetting时的报错问题

See merge request rays/pcloud-book!975
parents 6cb05388 10f47f02
......@@ -3078,7 +3078,7 @@ public class BookBizImpl implements BookBiz {
if (ListUtils.isEmpty(list)) {
return;
}
AccountSettingDto accountSettingDto = qrcodeSceneConsr.getWechatInfo(channelId);
// AccountSettingDto accountSettingDto = qrcodeSceneConsr.getWechatInfo(channelId);
List<Long> appIds = list.stream().filter(s -> "APP".equalsIgnoreCase(s.getServeType())).map(x -> x.getServeId()).collect(Collectors.toList());
List<Long> productIds = list.stream().filter(s -> "PRODUCT".equalsIgnoreCase(s.getServeType())).map(x -> x.getServeId()).collect(Collectors.toList());
Map<Long, ProductDto> productDtoMap = new HashMap<>();
......@@ -3118,7 +3118,7 @@ public class BookBizImpl implements BookBiz {
serveDto.setDepLabelName(productDto.getProductLabels().get(0).getDepLabelName());
serveDto.setPurLabelName(productDto.getProductLabels().get(0).getPurLabelName());
}
serveDto.setShortUrl(SendWeixinRequestTools.splitUrl(accountSettingDto, serveDto.getServeUrl()));
// serveDto.setShortUrl(SendWeixinRequestTools.splitUrl(accountSettingDto, serveDto.getServeUrl()));
serveDto.setServeCreateUser(productDto.getAuthor());
serveDto.setTransverseImg(productDto.getPicture1());
}
......@@ -3144,7 +3144,7 @@ public class BookBizImpl implements BookBiz {
serveDto.setProLabelId(appDto.getProLabelId());
serveDto.setDepLabelId(appDto.getDepLabelId());
serveDto.setPurLabelId(appDto.getPurLabelId());
serveDto.setShortUrl(SendWeixinRequestTools.splitUrl(accountSettingDto, serveDto.getServeUrl()));
// serveDto.setShortUrl(SendWeixinRequestTools.splitUrl(accountSettingDto, serveDto.getServeUrl()));
serveDto.setServeCreateUser(appDto.getCreatedUser());
serveDto.setTransverseImg(appDto.getTransverseImg());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment