From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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..91839a7 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;
@@ -642,8 +641,23 @@
if (!VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {
listNew.addAll(list);
} else if (list.size() > 0) { // 娲诲姩鍥剧墖涓嶅厑璁歌烦杞�
+
+ // 浜戝彂鍗曟槸鍚﹀紑鍚�
+ String cloudState = configService.getByVersion(ConfigKeyEnum.robotCloudOpen.getKey(), acceptData.getPlatform(),
+ Integer.parseInt(acceptData.getVersion()));
+ boolean cloudOpen = false;
+ if (!StringUtil.isNullOrEmpty(cloudState) && "1".equals(cloudState)) {
+ cloudOpen = true;
+ }
+
for (GoodsEvaluate goodsEvaluate : list) {
- if (goodsEvaluate.getType() != EvaluateEnum.activity) {
+ EvaluateEnum evaluateEnum = goodsEvaluate.getType();
+ // 鍗曞搧 娲诲姩鍙互涓�閿簯鍙戝崟
+ if (cloudOpen && evaluateEnum == EvaluateEnum.activity || evaluateEnum == EvaluateEnum.single ) {
+ goodsEvaluate.setCloud(true);
+ }
+
+ if (evaluateEnum != EvaluateEnum.activity) {
listNew.add(goodsEvaluate);
continue;
}
--
Gitblit v1.8.0