From 54e967d4158b1242e94757b56fda70fcb478fc89 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Fri, 17 Dec 2021 18:50:54 +0800
Subject: [PATCH] fix
---
xc-video.iml | 49 ++++++++++++++++++++++++
src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java | 27 +++++++------
2 files changed, 63 insertions(+), 13 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java
index 81ba9de..e225350 100644
--- a/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java
@@ -179,19 +179,6 @@
videoInfoVo.setCollectCnt(data.getCollectCnt());
videoInfoVo.setStarCnt(data.getStarCnt());
- if (AppContants.FLAG_INT_N.equals(videoInfoEntity.getIsFree())) {
- if (loginUser == null) {
- videoInfoVo.setNotLogin(AppContants.FLAG_INT_N);
- return videoInfoVo;
- }
-
- VideoMemberEntity member = this.videoMemberMapper.selectById(loginUser.getId());
- if (AppContants.FLAG_INT_N.equals(member.getIsVip())) {
- videoInfoVo.setNotVip(AppContants.FLAG_INT_N);
- return videoInfoVo;
- }
- }
-
if (loginUser != null) {
VideoCommentLikeEntity commentLike = this.videoCommentLikeMapper.selectCommentLikeByMemberIdAndRelateId(loginUser.getId(), videoInfoEntity.getId());
if (commentLike != null) {
@@ -208,6 +195,20 @@
}
}
+ if (AppContants.FLAG_INT_N.equals(videoInfoEntity.getIsFree())) {
+ if (loginUser == null) {
+ videoInfoVo.setNotLogin(AppContants.FLAG_INT_N);
+ return videoInfoVo;
+ }
+
+ VideoMemberEntity member = this.videoMemberMapper.selectById(loginUser.getId());
+ if (AppContants.FLAG_INT_N.equals(member.getIsVip())) {
+ videoInfoVo.setNotVip(AppContants.FLAG_INT_N);
+ return videoInfoVo;
+ }
+ }
+
+
VideoMasterItemsEntity currentItem = this.videoMasterItemsMapper.selectItemByVideoIdAndItemId(videoId, itemId);
if (currentItem == null) {
throw new FebsException("视频不存在");
diff --git a/xc-video.iml b/xc-video.iml
index 312a97f..80c52af 100644
--- a/xc-video.iml
+++ b/xc-video.iml
@@ -168,5 +168,54 @@
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+ <orderEntry type="library" name="Maven: com.github.javen205:IJPay-AliPay:2.7.8" level="project" />
+ <orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.16.50.ALL" level="project" />
+ <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" />
+ <orderEntry type="library" name="Maven: cn.hutool:hutool-crypto:5.7.13" level="project" />
+ <orderEntry type="library" name="Maven: cn.hutool:hutool-core:5.7.13" level="project" />
+ <orderEntry type="library" name="Maven: cn.hutool:hutool-http:5.7.13" level="project" />
+ <orderEntry type="library" name="Maven: cn.hutool:hutool-json:5.7.13" level="project" />
+ <orderEntry type="module-library">
+ <library name="Maven: org.tron.trident:abi:0.3.0">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/abi-0.3.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="Maven: org.tron.trident:utils:0.3.0">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/utils-0.3.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="Maven: org.tron.trident:core:0.3.0">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/core-0.3.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="Maven: com.sunlight:tron-sdk:1.0-SNAPSHOT">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/tron-sdk-1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.2.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.4.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.2.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.7.3" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.2.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE" level="project" />
</component>
</module>
\ No newline at end of file
--
Gitblit v1.9.1