From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化
---
fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 56c48fa..64e6ba7 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
@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.web;
import java.io.PrintWriter;
+import java.security.AccessControlContext;
import java.util.ArrayList;
import java.util.List;
@@ -18,17 +19,20 @@
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;
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.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;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
@@ -82,7 +86,8 @@
@RequestMapping(value = "getRecommenBanner", method = RequestMethod.GET)
public void getRecommendBanner(AcceptData acceptData, String callback, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystem("WEB", Constant.systemCommonConfig.getH5PackageName());
+ BusinessSystem system = businessSystemService.getBusinessSystem("WEB",
+ Constant.systemCommonConfig.getH5PackageName());
JSONObject json = new JSONObject();
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, WebControllerUtil.NOSYSTEM));
@@ -123,7 +128,6 @@
return;
}
-
/**
*
* 鏂规硶璇存槑: 鑾峰彇鍟嗗搧璇︽儏
@@ -136,18 +140,15 @@
*/
@RequestMapping(value = "getGoodsDetail", method = RequestMethod.GET)
- public void getGoodsDetail(final AcceptData acceptData, final String id, final String uid, String callback,
- PrintWriter out) {
+ public void getGoodsDetail(final AcceptData acceptData, final String id, final String uid, Integer goodsType,
+ String callback, PrintWriter out) {
+
long begin = java.lang.System.currentTimeMillis();
if (StringUtil.isNullOrEmpty(id)) {
out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
return;
}
BusinessSystem system = webControllerUtil.getSystem(acceptData);
- // 娣樼壒浠�
- if (system.getId() == 7) {
- system = businessSystemService.getBusinessSystem("ANDROID", Constant.systemCommonConfig.getAndroidPackageName());
- }
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, WebControllerUtil.NOSYSTEM));
@@ -181,14 +182,14 @@
if (uid != null && !"".equals(uid.trim())) {
CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
- Long.parseLong(id));
+ Long.parseLong(id), goodsType);
data.put("collection", collectionGoods != null ? true : false);
}
taoBaoGoodsBriefExtra.setAuctionUrl(null);
data.put("taobao", gson.toJson(taoBaoGoodsBriefExtra));
- String info = configService.get("detail_prompt");
+ String info = configService.getValue(ConfigKeyEnum.detailPrompt.getKey(), acceptData.getSystem());
data.put("info", info);
- String onlyInfo = configService.get("only_info");
+ String onlyInfo = configService.getValue(ConfigKeyEnum.onlyInfo.getKey(), acceptData.getSystem());
data.put("only", onlyInfo);
int showType = taoBaoGoodsBriefExtra.getShowType();
String price = "";
@@ -203,9 +204,9 @@
data.put("shareTitle", taoBaoGoodsBriefExtra.getTitle());
data.put("shareContent", "楼" + price + "鍏�");
data.put("shareImg", taoBaoGoodsBriefExtra.getPictUrl());
- String html = configService.get("downAPP");
+ 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() + "鍏� "
@@ -214,7 +215,7 @@
data.put("sharemoney", "鍒嗕韩濂栭噾 楼" + taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb) + "鍏�");
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
- final TaoBaoGoodsBrief tbb=tb;
+ final TaoBaoGoodsBrief tbb = tb;
} else {
out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�"));
--
Gitblit v1.8.0