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 | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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 93e9c91..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
@@ -136,8 +136,8 @@
@Resource
private ShareGoodsService shareGoodsService;
- @Resource
- private DailyCountMomentsService dailyCountMomentsService;
+ @Resource
+ private DailyCountMomentsService dailyCountMomentsService;
@Resource(name = "taskExecutor")
private TaskExecutor executor;
@@ -255,7 +255,7 @@
// 2.0.7杩斿洖鍙戝湀+娲诲姩+瀛﹂櫌+绱犳潗
list.add(map.get(TYPE_FAQUAN));
list.add(map.get(TYPE_HUODONG));
- list.add(map.get(TYPE_XUEYUAN));
+ // list.add(map.get(TYPE_XUEYUAN));
// list.add(map.get(TYPE_SUCAI));
} else if (VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
// 2.0.6杩斿洖鐑攢+娲诲姩+鎺ㄨ崘+瀛﹂櫌+閭�璇�
@@ -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,7 +884,7 @@
executor.execute(new Runnable() {
@Override
public void run() { // 娣诲姞姣忔棩缁熻
- dailyCountMomentsService.addShareClick();
+ dailyCountMomentsService.addShareClick();
}
});
}
@@ -919,7 +914,7 @@
} catch (ShareGoodsException e) {
e.printStackTrace();
}
- jumpLink = ShareControllerV2.getERCodeContentNew(
+ jumpLink = ShareControllerV2.getERCodeContentNew(
configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()), taoBaoLink.getGoods(),
TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
} else if (goodsVO.getGoodsType() == Constant.SOURCE_TYPE_JD) {
@@ -1040,9 +1035,9 @@
out.print(JsonUtil.loadTrueResult(data));
executor.execute(new Runnable() {
- @Override
+ @Override
public void run() { // 娣诲姞姣忔棩缁熻
- dailyCountMomentsService.addCopyComment();
+ dailyCountMomentsService.addCopyComment();
}
});
}
--
Gitblit v1.8.0