diff --git a/src/main/java/com/ycwl/basic/biz/PriceBiz.java b/src/main/java/com/ycwl/basic/biz/PriceBiz.java index cc60290..0acaf83 100644 --- a/src/main/java/com/ycwl/basic/biz/PriceBiz.java +++ b/src/main/java/com/ycwl/basic/biz/PriceBiz.java @@ -50,10 +50,10 @@ public class PriceBiz { }).forEach(goodsList::add); ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(scenicId); if (scenicConfig != null) { - if (!Integer.valueOf(1).equals(scenicConfig.getDisableSourceVideo())) { + if (!Boolean.TRUE.equals(scenicConfig.getDisableSourceVideo())) { goodsList.add(new GoodsListRespVO(1L, "录像集")); } - if (!Integer.valueOf(1).equals(scenicConfig.getDisableSourceImage())) { + if (!Boolean.TRUE.equals(scenicConfig.getDisableSourceImage())) { goodsList.add(new GoodsListRespVO(2L, "照片集")); } } diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java index 0ae63a9..0a2c89d 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java @@ -139,9 +139,9 @@ public class GoodsServiceImpl implements GoodsService { List goods = faceEntry.getValue(); return goods.stream().collect(Collectors.groupingBy(SourceRespVO::getType)).keySet().stream().filter(type -> { if (Integer.valueOf(1).equals(type)) { - return !Integer.valueOf(1).equals(scenicConfig.getDisableSourceVideo()); + return !Boolean.TRUE.equals(scenicConfig.getDisableSourceVideo()); } else if (Integer.valueOf(2).equals(type)) { - return !Integer.valueOf(1).equals(scenicConfig.getDisableSourceImage()); + return !Boolean.TRUE.equals(scenicConfig.getDisableSourceImage()); } return true; }).map(type -> { diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java index f262405..b8f5664 100644 --- a/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java @@ -324,7 +324,7 @@ public class FaceServiceImpl implements FaceService { } } else { // 重新切视频逻辑 - if (scenicConfig != null && !Integer.valueOf(1).equals(scenicConfig.getDisableSourceVideo())) { + if (scenicConfig != null && !Boolean.TRUE.equals(scenicConfig.getDisableSourceVideo())) { long videoCount = memberSourceEntityList.stream().filter(item -> item.getType().equals(1)).count(); long photoCount = memberSourceEntityList.stream().filter(item -> item.getType().equals(2)).count(); if (photoCount > videoCount) { @@ -443,7 +443,7 @@ public class FaceServiceImpl implements FaceService { sourceVideoContent.setLockType(-1); sourceImageContent.setLockType(-1); ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(faceRespVO.getScenicId()); - if (!Integer.valueOf(1).equals(scenicConfig.getDisableSourceImage())) { + if (!Boolean.TRUE.equals(scenicConfig.getDisableSourceImage())) { IsBuyRespVO isBuyRespVO = orderBiz.isBuy(userId, faceRespVO.getScenicId(), 2, faceId); sourceImageContent.setSourceType(isBuyRespVO.getGoodsType()); sourceImageContent.setContentId(isBuyRespVO.getGoodsId()); @@ -462,7 +462,7 @@ public class FaceServiceImpl implements FaceService { sourceImageContent.setFreeCount((int) freeCount); contentList.add(sourceImageContent); } - if (!Integer.valueOf(1).equals(scenicConfig.getDisableSourceVideo())) { + if (!Boolean.TRUE.equals(scenicConfig.getDisableSourceVideo())) { IsBuyRespVO isBuyRespVO = orderBiz.isBuy(userId, faceRespVO.getScenicId(), 1, faceId); sourceVideoContent.setSourceType(isBuyRespVO.getGoodsType()); sourceVideoContent.setContentId(isBuyRespVO.getGoodsId());