q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复下用户端未购买列表

Browse Source
This commit is contained in:
Jerry Yan
2025-07-21 11:05:14 +08:00
parent ce0cbb1c91
commit a5a7957f9e
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ycwl/basic/model/mobile/goods/GoodsReqQuery.java
View File

@@ -15,6 +15,8 @@ public class GoodsReqQuery {
private Integer isBuy; private Integer isBuy;
private Long faceId; private Long faceId;
private Long goodsId; private Long goodsId;
@ApiModelProperty("景区id")
private Long scenicId;
@ApiModelProperty("源素材商品类型 1视频 2图像") @ApiModelProperty("源素材商品类型 1视频 2图像")
private Integer sourceType; private Integer sourceType;
} }

36
src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java
View File

@@ -75,8 +75,6 @@ public class GoodsServiceImpl implements GoodsService {
@Autowired @Autowired
private SourceMapper sourceMapper; private SourceMapper sourceMapper;
@Autowired @Autowired
private ScenicMapper scenicMapper;
@Autowired
private FaceMapper faceMapper; private FaceMapper faceMapper;
@Autowired @Autowired
private TemplateRepository templateRepository; private TemplateRepository templateRepository;
@@ -87,8 +85,6 @@ public class GoodsServiceImpl implements GoodsService {
@Autowired @Autowired
private ScenicRepository scenicRepository; private ScenicRepository scenicRepository;
@Autowired @Autowired
private OrderRepository orderRepository;
@Autowired
private OrderBiz orderBiz; private OrderBiz orderBiz;
@Autowired @Autowired
private FaceRepository faceRepository; private FaceRepository faceRepository;
@@ -98,16 +94,20 @@ public class GoodsServiceImpl implements GoodsService {
private DeviceRepository deviceRepository; private DeviceRepository deviceRepository;
public ApiResponse<List<GoodsPageVO>> goodsList(GoodsReqQuery query) { public ApiResponse<List<GoodsPageVO>> goodsList(GoodsReqQuery query) {
FaceEntity face = faceRepository.getFace(query.getFaceId()); Long scenicId = query.getScenicId();
if (face == null) { if (query.getFaceId() != null) {
return ApiResponse.success(Collections.emptyList()); FaceEntity face = faceRepository.getFace(query.getFaceId());
if (face == null) {
return ApiResponse.success(Collections.emptyList());
}
scenicId = face.getScenicId();
} }
//查询原素材 //查询原素材
List<GoodsPageVO> goodsList = new ArrayList<>(); List<GoodsPageVO> goodsList = new ArrayList<>();
VideoReqQuery videoReqQuery = new VideoReqQuery(); VideoReqQuery videoReqQuery = new VideoReqQuery();
videoReqQuery.setScenicId(face.getScenicId()); videoReqQuery.setScenicId(scenicId);
videoReqQuery.setIsBuy(query.getIsBuy()); videoReqQuery.setIsBuy(query.getIsBuy());
videoReqQuery.setFaceId(face.getId()); videoReqQuery.setFaceId(query.getFaceId());
videoReqQuery.setMemberId(Long.valueOf(BaseContextHandler.getUserId())); videoReqQuery.setMemberId(Long.valueOf(BaseContextHandler.getUserId()));
//查询成片vlog //查询成片vlog
List<VideoRespVO> videoList = videoMapper.queryByRelation(videoReqQuery); List<VideoRespVO> videoList = videoMapper.queryByRelation(videoReqQuery);
@@ -125,25 +125,21 @@ public class GoodsServiceImpl implements GoodsService {
}); });
SourceReqQuery sourceReqQuery = new SourceReqQuery(); SourceReqQuery sourceReqQuery = new SourceReqQuery();
sourceReqQuery.setScenicId(face.getScenicId()); sourceReqQuery.setScenicId(scenicId);
sourceReqQuery.setIsBuy(query.getIsBuy()); sourceReqQuery.setIsBuy(query.getIsBuy());
sourceReqQuery.setFaceId(face.getId()); sourceReqQuery.setFaceId(query.getFaceId());
sourceReqQuery.setMemberId(Long.valueOf(BaseContextHandler.getUserId())); sourceReqQuery.setMemberId(Long.valueOf(BaseContextHandler.getUserId()));
//查询源素材 //查询源素材
List<SourceRespVO> sourceList = sourceMapper.queryByRelation(sourceReqQuery); List<SourceRespVO> sourceList = sourceMapper.queryByRelation(sourceReqQuery);
ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(face.getScenicId()); ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(scenicId);
List<GoodsPageVO> sourceGoods = sourceList.stream().collect(Collectors.groupingBy(SourceRespVO::getFaceId)).entrySet().stream().flatMap((faceEntry) -> { List<GoodsPageVO> sourceGoods = sourceList.stream().collect(Collectors.groupingBy(SourceRespVO::getFaceId)).entrySet().stream().flatMap((faceEntry) -> {
Long faceId = faceEntry.getKey(); Long faceId = faceEntry.getKey();
List<SourceRespVO> goods = faceEntry.getValue(); List<SourceRespVO> goods = faceEntry.getValue();
return goods.stream().collect(Collectors.groupingBy(SourceRespVO::getType)).keySet().stream().filter(type -> { return goods.stream().collect(Collectors.groupingBy(SourceRespVO::getType)).keySet().stream().filter(type -> {
if (Integer.valueOf(1).equals(type)) { if (Integer.valueOf(1).equals(type)) {
if (Integer.valueOf(1).equals(scenicConfig.getDisableSourceVideo())) { return !Integer.valueOf(1).equals(scenicConfig.getDisableSourceVideo());
return false;
}
} else if (Integer.valueOf(2).equals(type)) { } else if (Integer.valueOf(2).equals(type)) {
if (Integer.valueOf(1).equals(scenicConfig.getDisableSourceImage())) { return !Integer.valueOf(1).equals(scenicConfig.getDisableSourceImage());
return false;
}
} }
return true; return true;
}).map(type -> { }).map(type -> {
@@ -157,10 +153,10 @@ public class GoodsServiceImpl implements GoodsService {
goodsPageVO.setGoodsName("照片集"); goodsPageVO.setGoodsName("照片集");
goodsPageVO.setGoodsType(2); goodsPageVO.setGoodsType(2);
} }
goodsPageVO.setScenicId(face.getScenicId()); goodsPageVO.setScenicId(query.getScenicId());
return goodsPageVO; return goodsPageVO;
}); });
}).collect(Collectors.toList()); }).toList();
if (!sourceGoods.isEmpty()) { if (!sourceGoods.isEmpty()) {
if (goodsList.size() > 2) { if (goodsList.size() > 2) {
goodsList.addAll(2, sourceGoods); goodsList.addAll(2, sourceGoods);