diff --git a/src/main/java/com/ycwl/basic/biz/OrderBiz.java b/src/main/java/com/ycwl/basic/biz/OrderBiz.java index d0f1054b..d5acfbe1 100644 --- a/src/main/java/com/ycwl/basic/biz/OrderBiz.java +++ b/src/main/java/com/ycwl/basic/biz/OrderBiz.java @@ -16,7 +16,6 @@ import com.ycwl.basic.model.pc.order.entity.OrderItemEntity; import com.ycwl.basic.model.pc.order.resp.OrderAppRespVO; import com.ycwl.basic.model.pc.order.resp.OrderItemVO; import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity; -import com.ycwl.basic.model.pc.scenic.entity.ScenicEntity; import com.ycwl.basic.model.pc.source.entity.SourceEntity; import com.ycwl.basic.model.pc.task.entity.TaskEntity; import com.ycwl.basic.model.pc.template.resp.TemplateRespVO; @@ -87,7 +86,6 @@ public class OrderBiz { PriceObj priceObj = new PriceObj(); priceObj.setGoodsType(goodsType); priceObj.setGoodsId(goodsId); - ScenicEntity scenic = scenicRepository.getScenic(scenicId); ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(scenicId); if (scenicConfig != null) { if (Boolean.TRUE.equals(scenicConfig.getAllFree())) { @@ -117,7 +115,7 @@ public class OrderBiz { vlogProductItem.setProductType(ProductType.VLOG_VIDEO); vlogProductItem.setProductId(template.getId().toString()); vlogProductItem.setQuantity(videoTaskRepository.getTaskLensNum(video.getTaskId())); - vlogProductItem.setScenicId(scenic.getId().toString()); + vlogProductItem.setScenicId(scenicId.toString()); vlogCalculationRequest.setProducts(Collections.singletonList(vlogProductItem)); vlogCalculationRequest.setFaceId(priceObj.getFaceId()); PriceCalculationResult vlogCalculationResult = iPriceCalculationService.calculatePrice(vlogCalculationRequest); @@ -132,9 +130,9 @@ public class OrderBiz { PriceCalculationRequest calculationRequest = new PriceCalculationRequest(); ProductItem productItem = new ProductItem(); productItem.setProductType(goodsType == 1 ? ProductType.RECORDING_SET : ProductType.PHOTO_SET); - productItem.setProductId(scenic.getId().toString()); + productItem.setProductId(scenicId.toString()); productItem.setPurchaseCount(1); - productItem.setScenicId(scenic.getId().toString()); + productItem.setScenicId(scenicId.toString()); calculationRequest.setProducts(Collections.singletonList(productItem)); if (face != null) { calculationRequest.setUserId(face.getMemberId()); diff --git a/src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java b/src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java index 78e25ec9..92cd4c42 100644 --- a/src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java +++ b/src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java @@ -85,7 +85,7 @@ public class DownloadNotificationTasker { return; } - ScenicEntity scenic = scenicRepository.getScenic(item.getScenicId()); + ScenicV2DTO scenic = scenicRepository.getScenicBasic(item.getScenicId()); ScenicConfigManager configManager = scenicRepository.getScenicConfigManager(item.getScenicId()); String configTitle = configManager.getString("second_notification_title"); String configContent = configManager.getString("second_notification_content"); @@ -164,7 +164,7 @@ public class DownloadNotificationTasker { return; } - ScenicEntity scenic = scenicRepository.getScenic(item.getScenicId()); + ScenicV2DTO scenic = scenicRepository.getScenicBasic(item.getScenicId()); ScenicConfigManager configManager = scenicRepository.getScenicConfigManager(item.getScenicId()); String configTitle = configManager.getString("third_notification_title"); String configContent = configManager.getString("third_notification_content");