From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定

---
 fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java
index 000fc2d..b9cc562 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java
@@ -19,12 +19,10 @@
 import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
 import com.yeshi.fanli.entity.system.BusinessSystem;
 import com.yeshi.fanli.entity.system.ConfigKeyEnum;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBriefExtra;
 import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
-import com.yeshi.fanli.log.LogManager;
-import com.yeshi.fanli.log.LogType;
 import com.yeshi.fanli.service.inter.config.BusinessSystemService;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.SystemConfigService;
@@ -86,7 +84,7 @@
 	public void getRecommendBanner(AcceptData acceptData, String callback, PrintWriter out) {
 
 		BusinessSystem system = businessSystemService.getBusinessSystem("WEB",
-				Constant.systemCommonConfig.getH5PackageName());
+				Constant.systemCommonConfig.getH5PackageName(),acceptData.getSystem());
 		JSONObject json = new JSONObject();
 		if (system == null) {
 			out.print(JsonUtil.loadFalseResult(1, WebControllerUtil.NOSYSTEM));
@@ -175,7 +173,7 @@
 			else
 				type = 2;
 			List<TaoBaoUnionConfig> config = taoBaoUnionConfigService.getConfigByTypeCache(type);
-			TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(tb, config.get(0));
+			TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(tb, config.get(0),acceptData.getSystem());
 			if (!StringUtil.isNullOrEmpty(tb.getCouponLink()) && taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null)
 				taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(tb.getCouponLink());
 
@@ -186,9 +184,9 @@
 			}
 			taoBaoGoodsBriefExtra.setAuctionUrl(null);
 			data.put("taobao", gson.toJson(taoBaoGoodsBriefExtra));
-			String info = configService.get(ConfigKeyEnum.detailPrompt.getKey());
+			String info = configService.getValue(ConfigKeyEnum.detailPrompt.getKey(), acceptData.getSystem());
 			data.put("info", info);
-			String onlyInfo = configService.get(ConfigKeyEnum.onlyInfo.getKey());
+			String onlyInfo = configService.getValue(ConfigKeyEnum.onlyInfo.getKey(), acceptData.getSystem());
 			data.put("only", onlyInfo);
 			int showType = taoBaoGoodsBriefExtra.getShowType();
 			String price = "";
@@ -203,15 +201,15 @@
 			data.put("shareTitle", taoBaoGoodsBriefExtra.getTitle());
 			data.put("shareContent", "楼" + price + "鍏�");
 			data.put("shareImg", taoBaoGoodsBriefExtra.getPictUrl());
-			String html = configService.get(ConfigKeyEnum.downAPP.getKey());
+			String html = configService.getValue(ConfigKeyEnum.downAPP.getKey(), acceptData.getSystem());
 			data.put("downAPP", html);
-			String shareSinaContent = configService.get("shareSinaContent");
+			String shareSinaContent = configService.getValue("shareSinaContent", acceptData.getSystem());
 			data.put("shareSina",
 					"楼" + price + "鍏�      閫�" + appName + "绾㈠寘楼"
 							+ taoBaoGoodsBriefExtra.getTaoBaoHongBaoInfo().getHongbao() + "鍏�    "
 							+ taoBaoGoodsBriefExtra.getTitle() + shareSinaContent);
 
-			data.put("sharemoney", "鍒嗕韩濂栭噾 楼" + taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb) + "鍏�");
+			data.put("sharemoney", "鍒嗕韩濂栭噾 楼" + taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb,acceptData.getSystem()) + "鍏�");
 			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
 
 			final TaoBaoGoodsBrief tbb = tb;

--
Gitblit v1.8.0