From e44f0a6f4aba26f3b9c63b6581668cb3da5ff577 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 27 四月 2020 14:56:17 +0800
Subject: [PATCH] 根据用户ID获取分配的导师
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 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 be1839c..7daa906 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;
@@ -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,8 +914,8 @@
} catch (ShareGoodsException e) {
e.printStackTrace();
}
- jumpLink = ShareControllerV2.getERCodeContentNew(
- configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()), taoBaoLink.getGoods(),
+ jumpLink = ShareControllerV2.getERCodeContentNew(
+ 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());
@@ -1040,10 +1035,9 @@
out.print(JsonUtil.loadTrueResult(data));
executor.execute(new Runnable() {
- @Override
+ @Override
public void run() { // 娣诲姞姣忔棩缁熻
- // TODO
- // dailyCountMomentsService.addCopyComment();
+ dailyCountMomentsService.addCopyComment();
}
});
}
--
Gitblit v1.8.0