From eda623f37c3260f4b4657e34a8a39798c72432b1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 28 六月 2020 15:49:14 +0800
Subject: [PATCH] 搜索接口增加小黄条返回
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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 5efd651..30df6aa 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
@@ -55,7 +55,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
import com.yeshi.fanli.exception.goods.ConvertLinkExceptionException;
import com.yeshi.fanli.exception.share.ShareGoodsException;
-import com.yeshi.fanli.exception.user.cloud.UserCloudException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -626,7 +625,7 @@
* @param out
*/
@RequestMapping(value = "getDynamicList", method = RequestMethod.POST)
- public void getDynamicListNew(AcceptData acceptData, Integer page, Long cid, String subId, PrintWriter out) {
+ public void getDynamicListNew(AcceptData acceptData, Integer page, Long cid, String subId, Long uid, PrintWriter out) {
try {
int type = 1;
if (cid == TYPE_FAQUAN) {
@@ -642,12 +641,17 @@
if (!VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {
listNew.addAll(list);
} else if (list.size() > 0) { // 娲诲姩鍥剧墖涓嶅厑璁歌烦杞�
- for (GoodsEvaluate goodsEvaluate : list) {
- if (goodsEvaluate.getType() != EvaluateEnum.activity) {
- listNew.add(goodsEvaluate);
- continue;
+
+ // 浜戝彂鍗曟槸鍚﹀紑鍚�
+ boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpenCircle.getKey());
+ if (!cloudOpen && uid != null) {
+ List<String> testUsers = configService.getTestUsers();
+ if (testUsers != null && testUsers.contains(uid+"")) {
+ cloudOpen = true;
}
-
+ }
+
+ for (GoodsEvaluate goodsEvaluate : list) {
GoodsEvaluate evaluateNew = new GoodsEvaluate();
try {
PropertyUtils.copyProperties(evaluateNew, goodsEvaluate);
@@ -655,6 +659,19 @@
e.printStackTrace();
continue;
}
+
+ EvaluateEnum evaluateEnum = evaluateNew.getType();
+ // 鍗曞搧 娲诲姩鍙互涓�閿簯鍙戝崟
+ if (evaluateEnum == EvaluateEnum.activity || evaluateEnum == EvaluateEnum.single) {
+ evaluateNew.setCloud(cloudOpen);
+ }
+
+ if (evaluateEnum != EvaluateEnum.activity) {
+ listNew.add(evaluateNew);
+ continue;
+ }
+
+
// 璺宠浆杩囨浮椤�
// String jumpLink =
// configService.get(ConfigKeyEnum.activityDetailLink.getKey())
--
Gitblit v1.8.0