From 52bc8ff0de3c7538d1401423c1cba9615c0c2082 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 18 六月 2020 17:22:24 +0800
Subject: [PATCH] 发圈商品来源修改 + 云发单规则调整

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
index 6448a3f..78bb3d1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -1376,7 +1376,7 @@
 	 */
 	private void getCloudInfo(AcceptData acceptData,Long uid, GoodsDetailVO goodsDetail, GoodsDetailExtraVO extraVO) {
 		// 浜戝彂鍗曟槸鍚﹀紑鍚�
-		boolean cloudOpen = configService.isRobotCloudOpen();
+		boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpenGoodsDetail.getKey());
 		if (!cloudOpen && uid != null) {
 			List<String> testUsers = configService.getTestUsers();
 			if (testUsers != null && testUsers.contains(uid+"")) {
@@ -1385,7 +1385,8 @@
 		}
 		extraVO.setCloudOpen(cloudOpen);
 		
-		if (!goodsDetail.isHasCoupon()) {
+		// 鏃犲埜鎴栬�呮湭寮�鍚彂鍦�
+		if (!goodsDetail.isHasCoupon() || !cloudOpen) {
 			return;
 		}
 		

--
Gitblit v1.8.0