From 405d4520c7746be0f754213cb684aa6bbf647dcd Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 30 四月 2020 16:13:25 +0800
Subject: [PATCH] 用户额外信息清理
---
fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 3e6b45a..000fc2d 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
@@ -18,17 +18,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 +85,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 +127,6 @@
return;
}
-
/**
*
* 鏂规硶璇存槑: 鑾峰彇鍟嗗搧璇︽儏
@@ -136,18 +139,15 @@
*/
@RequestMapping(value = "getGoodsDetail", method = RequestMethod.GET)
- public void getGoodsDetail(final AcceptData acceptData, final String id, final String uid, Integer goodsType,
+ 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));
@@ -186,9 +186,9 @@
}
taoBaoGoodsBriefExtra.setAuctionUrl(null);
data.put("taobao", gson.toJson(taoBaoGoodsBriefExtra));
- String info = configService.get("detail_prompt");
+ String info = configService.get(ConfigKeyEnum.detailPrompt.getKey());
data.put("info", info);
- String onlyInfo = configService.get("only_info");
+ String onlyInfo = configService.get(ConfigKeyEnum.onlyInfo.getKey());
data.put("only", onlyInfo);
int showType = taoBaoGoodsBriefExtra.getShowType();
String price = "";
@@ -203,7 +203,7 @@
data.put("shareTitle", taoBaoGoodsBriefExtra.getTitle());
data.put("shareContent", "楼" + price + "鍏�");
data.put("shareImg", taoBaoGoodsBriefExtra.getPictUrl());
- String html = configService.get("downAPP");
+ String html = configService.get(ConfigKeyEnum.downAPP.getKey());
data.put("downAPP", html);
String shareSinaContent = configService.get("shareSinaContent");
data.put("shareSina",
@@ -214,7 +214,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