From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
index af2a432..93c7820 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -35,7 +35,6 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.dynamic.CommentInfo;
-import com.yeshi.fanli.entity.dynamic.CommentInfo.CommentInfoEnum;
import com.yeshi.fanli.entity.dynamic.DynamicInfo;
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate.EvaluateEnum;
@@ -49,6 +48,7 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.count.DailyCountMomentsService;
import com.yeshi.fanli.service.inter.dynamic.ArticleOfficialService;
import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;
import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
@@ -136,8 +136,8 @@
@Resource
private ShareGoodsService shareGoodsService;
- // @Resource
- // private DailyCountMomentsService dailyCountMomentsService;
+ @Resource
+ private DailyCountMomentsService dailyCountMomentsService;
@Resource(name = "taskExecutor")
private TaskExecutor executor;
@@ -371,12 +371,7 @@
if (special.getState() == 1L) {
list.remove(i--);
} else {
- if (special.getStartTime() != null && special.getEndTime() != null)
- special.setTimeTask(true);
- else
- special.setTimeTask(false);
-
- if (special.isTimeTask()) {
+ if (special.getStartTime() != null && special.getEndTime() != null) {
if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) {
list.remove(i--);
} else// 璁剧疆鍊掕鏃�
@@ -889,8 +884,7 @@
executor.execute(new Runnable() {
@Override
public void run() { // 娣诲姞姣忔棩缁熻
- // TODO
- // dailyCountMomentsService.addShareClick();
+ dailyCountMomentsService.addShareClick();
}
});
}
@@ -921,7 +915,7 @@
e.printStackTrace();
}
jumpLink = ShareControllerV2.getERCodeContentNew(
- configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()), taoBaoLink.getGoods(),
+ configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()), taoBaoLink.getGoods(),
TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
} else if (goodsVO.getGoodsType() == Constant.SOURCE_TYPE_JD) {
JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsVO.getGoodsId());
@@ -1008,8 +1002,7 @@
}
String newText = text; // 闈為�氱敤鍒搁渶瑕侀獙璇�
- if ((comment != null && comment.getTypeEnum() != CommentInfoEnum.currencyCoupon)
- || goodsEvaluate.getType() == EvaluateEnum.activity) {
+ if (comment != null && (comment.getNeedSpin() == null || comment.getNeedSpin())) {
try {
newText = convertLinkManager.convertLinkFromText(text, uid, true);
} catch (ConvertLinkExceptionException e) {
@@ -1044,8 +1037,7 @@
executor.execute(new Runnable() {
@Override
public void run() { // 娣诲姞姣忔棩缁熻
- // TODO
- // dailyCountMomentsService.addCopyComment();
+ dailyCountMomentsService.addCopyComment();
}
});
}
--
Gitblit v1.8.0