From 3df7c3cec0630eb3a208d9e9d2049b56a48e16a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 22 三月 2019 15:23:21 +0800
Subject: [PATCH] 专题编辑bug

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java |  328 ++++++++++++++----------------------------------------
 1 files changed, 88 insertions(+), 240 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index 28e7a7b..33db6f8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -16,6 +16,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.HttpUtil;
 import org.yeshi.utils.IPUtil;
 import org.yeshi.utils.JsonUtil;
 import org.yeshi.utils.NumberUtil;
@@ -36,12 +37,9 @@
 import com.yeshi.fanli.entity.bus.recommend.Honest;
 import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;
 import com.yeshi.fanli.entity.bus.recommend.RecommendBannerV2;
-import com.yeshi.fanli.entity.bus.recommend.RecommendSection;
-import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;
 import com.yeshi.fanli.entity.bus.recommend.RecommendSpecial;
 import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;
 import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;
-import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSection;
 import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSpecial;
 import com.yeshi.fanli.entity.bus.user.Order;
 import com.yeshi.fanli.entity.bus.user.ShamUser;
@@ -79,11 +77,9 @@
 import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
 import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
 import com.yeshi.fanli.service.inter.goods.RecommendBannerService;
-import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
 import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;
 import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;
 import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerV2Service;
-import com.yeshi.fanli.service.inter.goods.SuperRecommendSectionService;
 import com.yeshi.fanli.service.inter.goods.SuperRecommendSpecialService;
 import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
 import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
@@ -98,19 +94,16 @@
 import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
 import com.yeshi.fanli.service.inter.user.ShamUserService;
-import com.yeshi.fanli.service.inter.user.ShareManageService;
 import com.yeshi.fanli.service.inter.user.TBPidService;
 import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
 import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
 import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.util.AESUtil;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.ThreadUtil;
 import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.Utils;
 import com.yeshi.fanli.util.factory.MonitorFactory;
 import com.yeshi.fanli.util.taobao.TaoBaoCouponUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
@@ -135,22 +128,13 @@
 	private SuperRecommendBannerService superRecommendBannerService;
 
 	@Resource
-	private SuperRecommendSectionService superRecommendSectionService;
-
-	@Resource
 	private SuperRecommendSpecialService superRecommendSpecialService;
-
-	@Resource
-	private RecommendSectionGoodsService recommendSectionGoodsService;
 
 	@Resource
 	private OrderService orderService;
 
 	@Resource
 	private ScanHistoryV2Service scanHistoryV2Service;
-
-	@Resource
-	private ShareManageService shareManageService;
 
 	@Resource
 	private ConfigService configService;
@@ -239,92 +223,10 @@
 	@Resource
 	private UserInfoExtraService userInfoExtraService;
 
-	@RequestMapping(value = "getrecommendsection")
-	public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
-
-		if (index < 0) {
-			index = 0;
-		}
-
-		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
-		if (system == null) {
-			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
-			return;
-		}
-		List<SuperRecommendSection> superRecommendSectionList = superRecommendSectionService
-				.getSuperRecommendSectionBySystemId(system.getId());
-		List<RecommendSection> recommendSectionList = null;
-		for (SuperRecommendSection superRecommendSection : superRecommendSectionList) {
-			if (recommendSectionList == null) {
-				recommendSectionList = new ArrayList<RecommendSection>();
-			}
-			RecommendSection recommendSection = superRecommendSection.getRecommendSection();
-
-			// 鏆傛椂鏀瑰彉娣樼壒浠风殑璺宠浆鍦板潃
-			if (system.getId() == 7) {
-				recommendSection.setJumpUrl(recommendSection.getJumpUrl().replace("column.html", "column_ttj.html"));
-			}
-
-			recommendSectionList.add(recommendSection);
-		}
-		if (recommendSectionList == null) {
-			out.print(JsonUtil.loadFalseResult(1, "鏆傛棤鏁版嵁"));
-			return;
-		}
-		Utils.sort(recommendSectionList);
-		int size = recommendSectionList.size();
-
-		List<RecommendSectionGoods> recommendSectionGoodsList = null;
-		JSONObject data = new JSONObject();
-		data.put("count", size);
-		JSONArray dataArr = new JSONArray();
-		JSONObject validData = null;
-		Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
-				.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
-		BigDecimal proportion = manageService.getFanLiRate();
-		Map<Long, List<RecommendSectionGoods>> map = recommendSectionGoodsService.getAllSectionGoodsMap();
-		for (int i = 0; i < size; i++) {
-			validData = new JSONObject();
-			RecommendSection recommendSection = recommendSectionList.get(i);
-			recommendSectionGoodsList = map.get(recommendSection.getId());
-			if (recommendSectionGoodsList == null) {
-				continue;
-			}
-			Utils.sort(recommendSectionGoodsList);
-			if (recommendSection.getCounts() < recommendSectionGoodsList.size()) {
-				recommendSectionGoodsList = recommendSectionGoodsList.subList(0, recommendSection.getCounts());
-			}
-			validData.put("count", recommendSectionGoodsList.size());
-			validData.put("recommendSection", gson.toJson(recommendSection));
-
-			// 鏇挎崲TaoBaoGoodsBrief
-			JSONArray array = new JSONArray();
-			Gson gson2 = new GsonBuilder().setDateFormat("yyyy-MM-dd").create();
-			for (RecommendSectionGoods rss : recommendSectionGoodsList) {
-				JSONObject obj = JSONObject.fromObject(gson2.toJson(rss));
-				String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(
-						gson2.fromJson(obj.optJSONObject("taoBaoGoodsBrief").toString(), TaoBaoGoodsBrief.class),
-						proportion.toString(), ""));
-				obj.put("taoBaoGoodsBrief", json);
-				array.add(obj);
-			}
-
-			validData.put("recommendSectionGoodsList", array);
-			dataArr.add(validData);
-		}
-		data.put("data", dataArr);
-
-		String result = JsonUtil.loadTrueResult(data);
-		if (Constant.IS_OUTNET)
-			redisManager.cacheCommonString("client-api-getRecommendSection", result, 3 * 60);
-
-		out.print(result);
-		return;
-	}
-
 	@RequestMapping(value = "getHonestList")
 	public void getHonestList(AcceptData acceptData, PrintWriter out) {
-		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+				acceptData.getPackages());
 		List<Honest> honestList = null;
 		List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
 		if ((Integer.parseInt(acceptData.getVersion()) >= 20 && "android".equalsIgnoreCase(acceptData.getPlatform()))
@@ -491,7 +393,8 @@
 	@RequestMapping(value = "getrecommendspecial")
 	public void getRecommendSpecial(AcceptData acceptData, PrintWriter out) {
 
-		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+				acceptData.getPackages());
 
 		if (system == null) {
 			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -533,7 +436,8 @@
 	@RequestMapping(value = "guessLike", method = RequestMethod.POST)
 	public void guessLike(AcceptData acceptData, PrintWriter out) {
 
-		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+				acceptData.getPackages());
 
 		if (system == null) {
 			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -571,7 +475,8 @@
 	@RequestMapping(value = "getrecommendbanner")
 	public void getRecommendBanner(AcceptData acceptData, PrintWriter out) {
 
-		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+				acceptData.getPackages());
 		JSONObject json = new JSONObject();
 		if (system == null) {
 			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -638,7 +543,8 @@
 			out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
 			return;
 		}
-		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+				acceptData.getPackages());
 
 		if (system == null) {
 			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -775,11 +681,6 @@
 
 		} else {
 			out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�"));
-			ThreadUtil.run(new Runnable() {
-				public void run() {
-					recommendSectionGoodsService.deleteRecommendSectionGoodsByTbAuctionId(Long.parseLong(id));
-				}
-			});
 		}
 		long end = java.lang.System.currentTimeMillis();
 		java.lang.System.out.println("鑰楁椂:" + (end - begin));
@@ -796,7 +697,8 @@
 			out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
 			return;
 		}
-		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+				acceptData.getPackages());
 
 		if (system == null) {
 			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -815,38 +717,11 @@
 		// 鑾峰彇娣樺鍙傛暟
 		ClientTBPid clientTBPid = null;
 		// 鐢ㄦ埛宸茬粡鐧诲綍
-		if (!StringUtil.isNullOrEmpty(uid)) {
-			TBPid tbPid = null;
-			if (acceptData.getPlatform().equalsIgnoreCase("android")) {
-				tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);
-				if (tbPid != null) {
-					String siteId = tbPid.getPid().split("_")[2];
-					String adzoneId = tbPid.getPid().split("_")[3];
-					TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
-					clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
-				} else {
-					clientTBPid = tbPidService.getAndroidDefault();
-				}
 
-			} else {
-				tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);
-				if (tbPid != null) {
-
-					String siteId = tbPid.getPid().split("_")[2];
-					String adzoneId = tbPid.getPid().split("_")[3];
-					TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
-					clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
-				} else {
-					clientTBPid = tbPidService.getIOSDefault();
-				}
-			}
-
-		} else {
-			if (acceptData.getPlatform().equalsIgnoreCase("android"))
-				clientTBPid = tbPidService.getAndroidDefault();
-			else
-				clientTBPid = tbPidService.getIOSDefault();
-		}
+		if (acceptData.getPlatform().equalsIgnoreCase("android"))
+			clientTBPid = tbPidService.getAndroidDefault();
+		else
+			clientTBPid = tbPidService.getIOSDefault();
 
 		LogHelper.test("鑾峰彇PID鑰楁椂锛�" + (java.lang.System.currentTimeMillis() - startTime));
 
@@ -1099,25 +974,9 @@
 		if (!StringUtil.isNullOrEmpty(uid)) {
 			TBPid tbPid = null;
 			if (acceptData.getPlatform().equalsIgnoreCase("android")) {
-				tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);
-				if (tbPid != null) {
-					String siteId = tbPid.getPid().split("_")[2];
-					String adzoneId = tbPid.getPid().split("_")[3];
-					TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
-					clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
-				} else {
-					clientTBPid = tbPidService.getAndroidDefault();
-				}
+				clientTBPid = tbPidService.getAndroidDefault();
 			} else {
-				tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);
-				if (tbPid != null) {
-					String siteId = tbPid.getPid().split("_")[2];
-					String adzoneId = tbPid.getPid().split("_")[3];
-					TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
-					clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
-				} else {
-					clientTBPid = tbPidService.getIOSDefault();
-				}
+				clientTBPid = tbPidService.getIOSDefault();
 			}
 
 		} else {
@@ -1163,7 +1022,8 @@
 	// 鏍规嵁鍟嗗搧鑾峰彇鎺ㄨ崘
 	@RequestMapping(value = "getgoodsrecommend", method = RequestMethod.POST)
 	public void getGoodsRecommend(final AcceptData acceptData, long id, PrintWriter out) {
-		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+				acceptData.getPackages());
 		if (system == null) {
 			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
 			return;
@@ -1199,16 +1059,6 @@
 								goodsList.add(gds);
 						}
 				}
-			}
-
-			// 闇�瑕佸彟鍋氭帹鑽�
-			if (goodsList.size() < 6) {
-				List<RecommendSectionGoods> list = recommendSectionGoodsService.getSectionGoods(10);
-				if (list != null)
-					for (int i = 0; i < list.size(); i++) {
-						if (goodsList.size() < 6)
-							goodsList.add(list.get(i).getTaoBaoGoodsBrief());
-					}
 			}
 		}
 
@@ -1299,7 +1149,8 @@
 			return;
 		}
 		page = page + 1;
-		BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(), acceptData.getPackages());
+		BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(),
+				acceptData.getPackages());
 		if (sys == null) {
 			out.print(JsonUtil.loadFalseResult(1, "涓嶅瓨鍦ㄨ绯荤粺"));
 			return;
@@ -1344,7 +1195,8 @@
 
 	@RequestMapping(value = "deletescanhistory", method = RequestMethod.POST)
 	public void deleteScanHistory(AcceptData acceptData, String type, String uid, String ids, PrintWriter out) {
-		BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(), acceptData.getPackages());
+		BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(),
+				acceptData.getPackages());
 
 		if (sys == null) {
 			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -1509,7 +1361,8 @@
 	@RequestMapping(value = "getRecommendInfo")
 	public void getRecommendHomeInfo(AcceptData acceptData, PrintWriter out) {
 
-		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+				acceptData.getPackages());
 		if (system == null) {
 			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
 			return;
@@ -1616,7 +1469,8 @@
 	public void getNewRecommendInfo(AcceptData acceptData, Long uid, String specialCard, String swiperCard,
 			PrintWriter out) {
 
-		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+				acceptData.getPackages());
 		if (system == null) {
 			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
 			return;
@@ -1754,7 +1608,8 @@
 			return;
 		}
 
-		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+				acceptData.getPackages());
 		if (system == null) {
 			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
 			return;
@@ -1784,32 +1639,10 @@
 
 		} else {
 			// 鐢ㄦ埛宸茬粡鐧诲綍
-			TBPid tbPid = null;
 			if (acceptData.getPlatform().equalsIgnoreCase("android")) {
-
-				tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);
-
-				if (tbPid == null) {
-					clientTBPid = tbPidService.getAndroidDefault();
-				} else {
-					String siteId = tbPid.getPid().split("_")[2];
-					String adzoneId = tbPid.getPid().split("_")[3];
-					TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
-					clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
-				}
-
+				clientTBPid = tbPidService.getAndroidDefault();
 			} else {
-
-				tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);
-
-				if (tbPid == null) {
-					clientTBPid = tbPidService.getIOSDefault();
-				} else {
-					String siteId = tbPid.getPid().split("_")[2];
-					String adzoneId = tbPid.getPid().split("_")[3];
-					TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
-					clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
-				}
+				clientTBPid = tbPidService.getIOSDefault();
 			}
 		}
 
@@ -1976,9 +1809,13 @@
 
 			String token = "";
 			if (!StringUtil.isNullOrEmpty(tb.getCouponLink())) {
-				token = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());
-				tb.setCouponLinkTaoToken(token);
+				token = redisManager.getCommonTaoToken(tb.getAuctionId());
+				if (StringUtil.isNullOrEmpty(token)) {
+					token = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());
+					redisManager.saveCommonTaoToken(tb.getAuctionId(), token);
+				}
 			}
+			tb.setCouponLinkTaoToken(token);
 
 			// 鏈嶅姟绔浆閾�
 			if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {
@@ -2054,9 +1891,14 @@
 		data.put("shareUsers", listShareUser);
 		data.put("couponUsers", listCouponUser);
 		data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
-		//鍟嗗搧閾炬帴
-		data.put("h5Url", String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),
-				Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + ""));
+		// 鍟嗗搧閾炬帴
+		String h5Url = String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),
+				Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + "");
+		try {
+			data.put("h5Url", HttpUtil.getShortLink(h5Url));
+		} catch (Exception e) {
+			data.put("h5Url", h5Url);
+		}
 
 		// 鍙栨秷鍒嗕韩娲诲姩
 		// if (!StringUtil.isNullOrEmpty(uid)
@@ -2152,7 +1994,8 @@
 	@RequestMapping(value = "getgoodsderivation", method = RequestMethod.POST)
 	public void getRecommendGoods(AcceptData acceptData, long id, PrintWriter out) {
 
-		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+				acceptData.getPackages());
 		if (system == null) {
 			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
 			return;
@@ -2184,39 +2027,43 @@
 		});
 
 		List<TaoBaoGoodsBrief> listQuality = new ArrayList<TaoBaoGoodsBrief>();
-
-		try {
-			List<QualityFactory> listRecommend = qualityGoodsService.recommendByAuctionId(id);
-
-			if (listRecommend != null && listRecommend.size() > 1) {
-				for (QualityFactory quality : listRecommend) {
-
-					TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();
-					if (taoBaoGoodsBrief == null) {
-						continue;
-					}
-
-					int biz30day = taoBaoGoodsBrief.getBiz30day();
-					if (biz30day >= 10000) {
-						double sales = biz30day;
-						String salesCountMidea = String.format("%.1f", sales / 10000);
-						taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
-					} else {
-						taoBaoGoodsBrief.setSalesCount(biz30day + "");
-					}
-
-					// 鏀瑰彉鍥剧墖灏哄
-					String pictUrl = taoBaoGoodsBrief.getPictUrl();
-					if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {
-						taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
-					}
-
-					listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null));
-				}
-			}
-		} catch (Exception e2) {
-			e2.printStackTrace();
-		}
+		// 鍒犻櫎鎺ㄨ崘
+		//
+		// try {
+		// List<QualityFactory> listRecommend =
+		// qualityGoodsService.recommendByAuctionId(id);
+		//
+		// if (listRecommend != null && listRecommend.size() > 1) {
+		// for (QualityFactory quality : listRecommend) {
+		//
+		// TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();
+		// if (taoBaoGoodsBrief == null) {
+		// continue;
+		// }
+		//
+		// int biz30day = taoBaoGoodsBrief.getBiz30day();
+		// if (biz30day >= 10000) {
+		// double sales = biz30day;
+		// String salesCountMidea = String.format("%.1f", sales / 10000);
+		// taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
+		// } else {
+		// taoBaoGoodsBrief.setSalesCount(biz30day + "");
+		// }
+		//
+		// // 鏀瑰彉鍥剧墖灏哄
+		// String pictUrl = taoBaoGoodsBrief.getPictUrl();
+		// if (!StringUtil.isNullOrEmpty(pictUrl) &&
+		// !pictUrl.contains("320x320")) {
+		// taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
+		// }
+		//
+		// listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
+		// proportion.toString(), null));
+		// }
+		// }
+		// } catch (Exception e2) {
+		// e2.printStackTrace();
+		// }
 
 		// 鍙栧伓鏁颁釜鏁版嵁
 		if (listExtra.size() % 2 != 0) {
@@ -2243,7 +2090,8 @@
 	@RequestMapping(value = "getSpecialActivities")
 	public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out) {
 
-		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+				acceptData.getPackages());
 		if (system == null) {
 			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
 			return;

--
Gitblit v1.8.0