From a5fde818ef9969e2e53acfa29b2e6f423bd0c8fc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 30 四月 2020 19:02:51 +0800
Subject: [PATCH] 小米推送bug修改，增加用户团队信息消费
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 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 b467a7b..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
@@ -48,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;
@@ -135,8 +136,8 @@
@Resource
private ShareGoodsService shareGoodsService;
- // @Resource
- // private DailyCountMomentsService dailyCountMomentsService;
+ @Resource
+ private DailyCountMomentsService dailyCountMomentsService;
@Resource(name = "taskExecutor")
private TaskExecutor executor;
@@ -254,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杩斿洖鐑攢+娲诲姩+鎺ㄨ崘+瀛﹂櫌+閭�璇�
@@ -370,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// 璁剧疆鍊掕鏃�
@@ -888,8 +884,7 @@
executor.execute(new Runnable() {
@Override
public void run() { // 娣诲姞姣忔棩缁熻
- // TODO
- // 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) {
@@ -1042,8 +1037,7 @@
executor.execute(new Runnable() {
@Override
public void run() { // 娣诲姞姣忔棩缁熻
- // TODO
- // dailyCountMomentsService.addCopyComment();
+ dailyCountMomentsService.addCopyComment();
}
});
}
--
Gitblit v1.8.0