订单类型,名称变更

This commit is contained in:
2025-02-26 13:43:44 +08:00
parent e199e0e57b
commit 99f5adf841
12 changed files with 57 additions and 17 deletions

View File

@@ -38,7 +38,7 @@ public class PriceBiz {
ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(scenicId);
if (scenicConfig != null) {
if (!Integer.valueOf(1).equals(scenicConfig.getDisableSourceVideo())) {
goodsList.add(new GoodsListRespVO(1L, "原片"));
goodsList.add(new GoodsListRespVO(1L, "录像"));
}
if (!Integer.valueOf(1).equals(scenicConfig.getDisableSourceImage())) {
goodsList.add(new GoodsListRespVO(2L, "照片集"));
@@ -52,8 +52,11 @@ public class PriceBiz {
if (priceConfig == null) {
return Collections.emptyList();
}
String[] goodsIds = priceConfig.getGoodsIds().split(",");
List<GoodsListRespVO> goodsList = listGoodsByScenic(priceConfig.getScenicId());
if (Integer.valueOf(-1).equals(priceConfig.getType())) {
return goodsList;
}
String[] goodsIds = priceConfig.getGoodsIds().split(",");
return goodsList.stream().filter(goods -> {
for (String goodsId : goodsIds) {
if (StringUtils.equals(goods.getGoodsId().toString(), goodsId)) {