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

npe

Browse Source
This commit is contained in:
Jerry Yan
2025-09-21 21:18:43 +08:00
parent 48bd9d2b0c
commit 878dec2c55
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java
View File

@@ -88,10 +88,10 @@ public class AppScenicController {
resp.setBrokerDirectRate(scenicConfig.getBigDecimal("broker_direct_rate")); resp.setBrokerDirectRate(scenicConfig.getBigDecimal("broker_direct_rate"));
resp.setVideoSourcePackHint(scenicConfig.getString("video_source_pack_hint")); resp.setVideoSourcePackHint(scenicConfig.getString("video_source_pack_hint"));
resp.setImageSourcePackHint(scenicConfig.getString("image_source_pack_hint")); resp.setImageSourcePackHint(scenicConfig.getString("image_source_pack_hint"));
resp.setVoucherEnable(scenicConfig.getBoolean("voucher_enable")); resp.setVoucherEnable(scenicConfig.getBoolean("voucher_enable", false));
resp.setEnableVoucher(scenicConfig.getBoolean("voucher_enable")); // compactible resp.setEnableVoucher(scenicConfig.getBoolean("voucher_enable", false)); // compactible
resp.setGroupingEnable(scenicConfig.getBoolean("grouping_enable")); resp.setGroupingEnable(scenicConfig.getBoolean("grouping_enable", false));
resp.setShowPhotoWhenWaiting(scenicConfig.getBoolean("show_photo_when_waiting")); resp.setShowPhotoWhenWaiting(scenicConfig.getBoolean("show_photo_when_waiting", false));
return ApiResponse.success(resp); return ApiResponse.success(resp);
} }

2
src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java
View File

@@ -619,7 +619,7 @@ public class TaskTaskServiceImpl implements TaskService {
String title = configTitle.replace("【景区】", scenic.getName()); String title = configTitle.replace("【景区】", scenic.getName());
String page; String page;
if (configManager.getBoolean("grouping_enable")) { if (configManager.getBoolean("grouping_enable", false)) {
page = "pages/travelVideoCenter/index?type=1&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId(); page = "pages/travelVideoCenter/index?type=1&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId();
} else { } else {
page = "pages/videoSynthesis/index?type=1&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId(); page = "pages/videoSynthesis/index?type=1&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId();

6
src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java
View File

@@ -77,7 +77,7 @@ public class DownloadNotificationTasker {
String title = configTitle.replace("【景区】", scenic.getName()); String title = configTitle.replace("【景区】", scenic.getName());
String page; String page;
if (configManager.getBoolean("grouping_enable")) { if (configManager.getBoolean("grouping_enable", false)) {
page = "pages/travelVideoCenter/index?type=2&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId(); page = "pages/travelVideoCenter/index?type=2&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId();
} else { } else {
page = "pages/videoSynthesis/index?type=2&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId(); page = "pages/videoSynthesis/index?type=2&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId();
@@ -137,7 +137,7 @@ public class DownloadNotificationTasker {
String title = configTitle.replace("【景区】", scenic.getName()); String title = configTitle.replace("【景区】", scenic.getName());
String page; String page;
if (configManager.getBoolean("grouping_enable")) { if (configManager.getBoolean("grouping_enable", false)) {
page = "pages/travelVideoCenter/index?type=3&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId(); page = "pages/travelVideoCenter/index?type=3&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId();
} else { } else {
page = "pages/videoSynthesis/index?type=3&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId(); page = "pages/videoSynthesis/index?type=3&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId();
@@ -222,7 +222,7 @@ public class DownloadNotificationTasker {
log.info("发送模板消息"); log.info("发送模板消息");
String title = configTitle.replace("【景区】", scenic.getName()); String title = configTitle.replace("【景区】", scenic.getName());
String page; String page;
if (configManager.getBoolean("grouping_enable")) { if (configManager.getBoolean("grouping_enable", false)) {
page = "pages/travelVideoCenter/index?type=2&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId(); page = "pages/travelVideoCenter/index?type=2&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId();
} else { } else {
page = "pages/videoSynthesis/index?type=2&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId(); page = "pages/videoSynthesis/index?type=2&scenicId=" + item.getScenicId() + "&faceId=" + item.getFaceId();