From f6bd7e48a3eeaf1b6edf2d4a9198619665c82e7b Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Tue, 26 Aug 2025 14:29:45 +0800
Subject: [PATCH] =?UTF-8?q?refactor(basic):=20=E5=B0=86=20ScenicConfigEnti?=
 =?UTF-8?q?ty=20=E4=B8=AD=E7=9A=84=20allFree=20=E5=AD=97=E6=AE=B5=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=BB=8E=20Integer=20=E6=94=B9=E4=B8=BA=20Boolean?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改了 OrderBiz、PriceBiz 中的相关代码，使用 Boolean.TRUE 进行比较
- 更新了 ScenicConfigEntity 和 ScenicConfigResp 中 allFree 字段的类型
- 在 ScenicRepository 中使用 ConfigValueUtil.getBooleanValue 方法获取 allFree 的值
---
 src/main/java/com/ycwl/basic/biz/OrderBiz.java                  | 2 +-
 src/main/java/com/ycwl/basic/biz/PriceBiz.java                  | 2 +-
 .../ycwl/basic/model/pc/scenic/entity/ScenicConfigEntity.java   | 2 +-
 .../com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java   | 2 +-
 src/main/java/com/ycwl/basic/repository/ScenicRepository.java   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/biz/OrderBiz.java b/src/main/java/com/ycwl/basic/biz/OrderBiz.java
index 83825a1..b6232c3 100644
--- a/src/main/java/com/ycwl/basic/biz/OrderBiz.java
+++ b/src/main/java/com/ycwl/basic/biz/OrderBiz.java
@@ -88,7 +88,7 @@ public class OrderBiz {
         ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(scenicId);
         priceObj.setScenicAllPrice(scenic.getPrice());
         if (scenicConfig != null) {
-            if (Integer.valueOf(1).equals(scenicConfig.getAllFree())) {
+            if (Boolean.TRUE.equals(scenicConfig.getAllFree())) {
                 // 景区全免
                 priceObj.setFree(true);
                 priceObj.setPrice(BigDecimal.ZERO);
diff --git a/src/main/java/com/ycwl/basic/biz/PriceBiz.java b/src/main/java/com/ycwl/basic/biz/PriceBiz.java
index fc6747d..cc60290 100644
--- a/src/main/java/com/ycwl/basic/biz/PriceBiz.java
+++ b/src/main/java/com/ycwl/basic/biz/PriceBiz.java
@@ -92,7 +92,7 @@ public class PriceBiz {
         }
         ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(scenicId);
         if (scenicConfig != null) {
-            if (Integer.valueOf(1).equals(scenicConfig.getAllFree())) {
+            if (Boolean.TRUE.equals(scenicConfig.getAllFree())) {
                 // 景区全免
                 respVO.setFree(true);
                 respVO.setSlashPrice(BigDecimal.ZERO);
diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicConfigEntity.java b/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicConfigEntity.java
index c611b5a..a7c3c0f 100644
--- a/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicConfigEntity.java
+++ b/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicConfigEntity.java
@@ -67,7 +67,7 @@ public class ScenicConfigEntity {
     /**
      * 是否开启全部免费
      */
-    private Integer allFree;
+    private Boolean allFree;
     /**
      * 是否禁用源视频
      * 0-否 1-是
diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java b/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java
index 1903f73..80d3bd2 100644
--- a/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java
+++ b/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java
@@ -34,7 +34,7 @@ public class ScenicConfigResp {
      * 视频保存时间
      */
     private Integer videoStoreDay;
-    private Integer allFree;
+    private Boolean allFree;
     private Boolean disableSourceVideo;
     private Boolean disableSourceImage;
     private Integer antiScreenRecordType;
diff --git a/src/main/java/com/ycwl/basic/repository/ScenicRepository.java b/src/main/java/com/ycwl/basic/repository/ScenicRepository.java
index 764274d..4ed0b4a 100644
--- a/src/main/java/com/ycwl/basic/repository/ScenicRepository.java
+++ b/src/main/java/com/ycwl/basic/repository/ScenicRepository.java
@@ -164,7 +164,7 @@ public class ScenicRepository {
         entity.setSampleStoreDay(ConfigValueUtil.getIntValue(config, "sampleStoreDay"));
         entity.setFaceStoreDay(ConfigValueUtil.getIntValue(config, "faceStoreDay"));
         entity.setVideoStoreDay(ConfigValueUtil.getIntValue(config, "videoStoreDay"));
-        entity.setAllFree(ConfigValueUtil.getIntValue(config, "allFree"));
+        entity.setAllFree(ConfigValueUtil.getBooleanValue(config, "allFree"));
         entity.setDisableSourceVideo(ConfigValueUtil.getBooleanValue(config, "disableSourceVideo"));
         entity.setDisableSourceImage(ConfigValueUtil.getBooleanValue(config, "disableSourceImage"));
         entity.setTemplateNewVideoType(ConfigValueUtil.getIntValue(config, "templateNewVideoType"));