refactor(face): 优化拼图模板内容生成逻辑

- 修改拼图模板内容生成方式,支持多个模板内容生成
- 使用forEach循环处理每个模板,确保内容正确插入
- 保留原有价格计算和购买状态判断逻辑
- 确保contentId在记录存在时正确设置
- 维持原有的商品类型、分组和排序设置
This commit is contained in:
2025-11-21 17:46:28 +08:00
parent 83cfbc67e1
commit c0daa4d3b2

View File

@@ -454,18 +454,19 @@ public class FaceServiceImpl implements FaceService {
}
}).collect(Collectors.toList());
int count = puzzleGenerationRecordMapper.countByFaceId(faceId);
if (count > 0) {
ContentPageVO sfpContent = new ContentPageVO();
List<PuzzleTemplateEntity> puzzleTemplateEntityList = puzzleTemplateMapper.list(face.getScenicId(), null, 1);
if (!puzzleTemplateEntityList.isEmpty()) {
List<PuzzleGenerationRecordEntity> records = puzzleGenerationRecordMapper.listByFaceId(faceId);
PuzzleTemplateEntity template = puzzleTemplateMapper.getById(records.getFirst().getTemplateId());
puzzleTemplateEntityList.forEach(template -> {
Optional<PuzzleGenerationRecordEntity> optionalRecord = records.stream().filter(r -> r.getTemplateId().equals(template.getId())).findFirst();
ContentPageVO sfpContent = new ContentPageVO();
sfpContent.setName(template.getName());
sfpContent.setGroup("plog");
sfpContent.setScenicId(face.getScenicId());
sfpContent.setContentType(3);
sfpContent.setSourceType(3);
sfpContent.setLockType(-1);
sfpContent.setContentId(records.getFirst().getId());
sfpContent.setContentId(optionalRecord.map(PuzzleGenerationRecordEntity::getId).orElse(null));
sfpContent.setTemplateId(template.getId());
sfpContent.setTemplateCoverUrl(template.getCoverImage());
sfpContent.setGoodsType(3);
@@ -493,6 +494,7 @@ public class FaceServiceImpl implements FaceService {
sfpContent.setFreeCount(1);
}
contentList.add(1, sfpContent);
});
}
SourceReqQuery sourceReqQuery = new SourceReqQuery();
sourceReqQuery.setScenicId(face.getScenicId());