From 7f2f5ef5637a6871f4329e464eeba97eb59e94a3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 21 八月 2019 10:45:38 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java |  413 +++++++++++++++++++++++++++-------------------------------
 1 files changed, 195 insertions(+), 218 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
index c4cb203..283bdb3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
@@ -6,31 +6,27 @@
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.taobao.TbImgUtil;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.jd.JDSearchResult;
+import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
+import com.yeshi.fanli.dto.pdd.PDDGoodsResult;
 import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
 import com.yeshi.fanli.entity.bus.lable.QualityFactory;
 import com.yeshi.fanli.entity.common.JumpDetailV2;
-import com.yeshi.fanli.entity.taobao.SearchFilter;
+import com.yeshi.fanli.entity.jd.JDGoods;
 import com.yeshi.fanli.entity.taobao.TLJBuyGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
 import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
 import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -40,15 +36,18 @@
 import com.yeshi.fanli.service.inter.homemodule.SpecialService;
 import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.jd.JDGoodsService;
 import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;
 import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
 import com.yeshi.fanli.service.inter.monitor.MonitorService;
+import com.yeshi.fanli.service.inter.pdd.PDDGoodsService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TaoBaoConstant;
-import com.yeshi.fanli.util.Utils;
 import com.yeshi.fanli.util.VersionUtil;
 import com.yeshi.fanli.util.factory.MonitorFactory;
 import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
@@ -74,13 +73,13 @@
 
 	@Resource
 	private RedisManager redisManager;
-	
+
 	@Resource
 	private HomeRecommendGoodsService homeRecommendGoodsService;
-	
+
 	@Resource
 	private ConfigService configService;
-	
+
 	@Resource
 	private MonitorService monitorService;
 
@@ -92,20 +91,28 @@
 
 	@Resource
 	private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;
-	
+
 	@Resource
 	private JumpDetailV2Service jumpDetailV2Service;
-	
+
 	@Resource
 	private DeviceSexService deviceSexService;
-	
+
 	@Resource
 	private SpecialService specialService;
 
 	@Resource
 	private SwiperPictureService swiperPictureService;
-	
-	
+
+	@Resource
+	private JDGoodsService jdGoodsService;
+
+	@Resource
+	private PDDGoodsService pddGoodsService;
+
+	@Resource
+	private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
+
 	/**
 	 * 鏂扮増鎺ㄨ崘涓撻绠$悊(1.5.3)
 	 * 
@@ -122,10 +129,16 @@
 			JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);
 
 			// 2銆侀《閮ㄨ疆鎾浘
-			List<SwiperPicture> topPicList = swiperPictureService.getByBannerCard("index_top");
-			if (topPicList == null) {
-				topPicList = new ArrayList<SwiperPicture>();
+			List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("index_top");
+			List<SwiperPicture> topPicList = new ArrayList<>();
+			if (oldtopPicList != null && oldtopPicList.size() > 0)
+				topPicList.addAll(oldtopPicList);
+			if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
+				SwiperPicture notifyReName = swiperPictureService.selectByPrimaryKey(162L);
+				if (notifyReName != null)
+					topPicList.add(0, notifyReName);
 			}
+
 			root.put("topPicList", JsonUtil.getApiCommonGson().toJson(topPicList));
 
 			// 3銆侀個璇锋湁濂�
@@ -149,6 +162,8 @@
 			}
 
 			root.put("spikeGoods", getSpikeGoodsContent(acceptData));
+			if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
+				root.put("scoreExchange", getScoreExchangeInfo(acceptData));
 
 			out.print(JsonUtil.loadTrueResult(root));
 		} catch (Exception e) {
@@ -160,9 +175,7 @@
 			}
 		}
 	}
-	
 
-	
 	/**
 	 * 闄愭椂绉掓潃 1.5.3
 	 * 
@@ -174,8 +187,6 @@
 		JSONObject root = getSpikeGoodsContent(acceptData);
 		out.print(JsonUtil.loadTrueResult(root));
 	}
-	
-	
 
 	private JSONObject getSpikeGoodsContent(AcceptData acceptData) {
 		// 涓嬩竴娆″�掕鏃剁殑鏃堕棿
@@ -232,7 +243,7 @@
 
 			BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 			BigDecimal shareRate = hongBaoManageService.getShareRate();
-			
+
 			Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
 					.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
 
@@ -249,11 +260,12 @@
 				if (taoBaoGoodsBrief == null) {
 					continue;
 				}
-				GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate);
-				
+				GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate,
+						shareRate);
+
 				JSONObject params = new JSONObject();
 				params.put("url", configService.get("spike_goods_link") + "?id=" + taoBaoGoodsBrief.getAuctionId());
-				
+
 				JSONObject goods = new JSONObject();
 				goods.put("goods", gson.toJson(detailVO));
 				goods.put("params", params);
@@ -273,78 +285,101 @@
 		Long endTime = nextTime.getTimeInMillis() - java.lang.System.currentTimeMillis();
 
 		JSONObject root = new JSONObject();
-		root.put("time", nextTime.getTimeInMillis());
-		root.put("endTime", endTime > 0 ? endTime : 0);
-		root.put("listgoods", array);
-
-		JSONObject params = new JSONObject();
-		params.put("url", configService.get("spike_goods_link"));
-
-		root.put("params", params);
-		root.put("jumpDetail", jumpDetail);
+		if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
+			root.put("time", nextTime.getTimeInMillis());
+			root.put("endTime", endTime > 0 ? endTime : 0);
+			JSONArray imgArray = new JSONArray();
+			if (array != null)
+				for (int i = 0; i < array.size(); i++) {
+					imgArray.add(array.optJSONObject(i).optJSONObject("goods").optString("picUrl"));
+				}
+			root.put("imgList", imgArray);
+			JSONObject params = new JSONObject();
+			params.put("url", configService.get("spike_goods_link"));
+			root.put("params", params);
+			root.put("jumpDetail", jumpDetail);
+			root.put("name", "闄愭椂绉掓潃");
+			root.put("desc", "鏁寸偣鏇存柊锛屽ソ鐗╂姠璐�");
+		} else {
+			root.put("time", nextTime.getTimeInMillis());
+			root.put("endTime", endTime > 0 ? endTime : 0);
+			root.put("listgoods", array);
+			JSONObject params = new JSONObject();
+			params.put("url", configService.get("spike_goods_link"));
+			root.put("params", params);
+			root.put("jumpDetail", jumpDetail);
+		}
 
 		return root;
 	}
-	
-	
-	
+
+	/**
+	 * 閲戝竵鍏戞崲淇℃伅
+	 * 
+	 * @param acceptData
+	 * @return
+	 */
+	private JSONObject getScoreExchangeInfo(AcceptData acceptData) {
+
+		JSONObject root = new JSONObject();
+		JSONArray array = new JSONArray();
+		array.add(
+				"http://img.flqapp.com/resource/integral/integral_home_icon_2.png");
+		array.add(
+				"http://img.flqapp.com/resource/integral/integral_home_icon_1.png");
+		root.put("imgList", array);
+		JSONObject params = new JSONObject();
+		params.put("balanceMore", true);
+		root.put("params", params);
+		root.put("jumpDetail", jumpDetailV2Service.getByTypeCache("integralExchange",
+				Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())));
+
+		root.put("name", "閲戝竵鍏戞崲");
+		root.put("desc", "姣忔棩绛惧埌锛屾儕鍠滀笉鍋�");
+		root.put("tagImg", "http://img.flqapp.com/resource/score_exchange_tag.png");
+		return root;
+	}
+
 	/**
 	 * 棣栭〉搴曢儴鍟嗗搧鎺ㄨ崘
+	 * 
 	 * @param acceptData
 	 * @param out
 	 */
 	@RequestMapping(value = "getGoodList")
-	public void getGoodList(AcceptData acceptData, Integer goodsType, Integer page,
-			HttpServletRequest request, PrintWriter out) {
-		
+	public void getGoodList(AcceptData acceptData, Integer goodsType, Integer page, HttpServletRequest request,
+			PrintWriter out) {
+
 		if (goodsType == null || page == null) {
 			out.print(JsonUtil.loadFalseResult("鍙傛暟淇℃伅涓嶆甯�"));
 			return;
 		}
-		
-		if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
-			taoBaoGuessUserLikeByDevice(acceptData, page, request, out);
-			return;
-		}
-		
-		if (goodsType == Constant.SOURCE_TYPE_JD) {
-			
-		}
-		
-		if (goodsType == Constant.SOURCE_TYPE_PDD) {
-			
-		}
-		
-		List<QualityFactory> listQuery = qualityGoodsService.listFreeGoods((page - 1) * 20, 20);
-		if (listQuery == null) {
-			listQuery = new ArrayList<QualityFactory>();
-		}
 
-		JSONArray array = new JSONArray();
-		if (listQuery.size() > 0) {
-			Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
-					.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
-			
-			BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
-			BigDecimal shareRate = hongBaoManageService.getShareRate();
-			for (QualityFactory qualityFactory : listQuery) {
-				TaoBaoGoodsBrief goods = qualityFactory.getTaoBaoGoodsBrief();
-				if (goods == null) {
-					continue;
-				}
-				array.add(gson.toJson(GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate)));
+		try {
+			if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+				taoBaoGuessUserLikeByDevice(acceptData, page, request, out);
+				return;
 			}
+
+			if (goodsType == Constant.SOURCE_TYPE_JD) {
+				getIndexJDGoods(acceptData, page, out);
+				return;
+			}
+
+			if (goodsType == Constant.SOURCE_TYPE_PDD) {
+				getIndexPDDGoods(acceptData, page, out);
+				return;
+			}
+			out.print(JsonUtil.loadFalseResult("鍟嗗搧绫诲瀷閿欒"));
+		} catch (Exception e) {
+			LogHelper.errorDetailInfo(e);
+			JSONObject data = new JSONObject();
+			data.put("list", new JSONArray());
+			data.put("count", 0);
+			out.print(JsonUtil.loadTrueResult(data));
 		}
-		long count = qualityGoodsService.countFreeGoods();
-		
-		JSONObject root = new JSONObject();
-		root.put("count", count);
-		root.put("list", array);
-		out.print(JsonUtil.loadTrueResult(root));
 	}
-	
-	
-	
+
 	/**
 	 * 鏍规嵁璁惧淇℃伅鑾峰彇鐚滀綘鍠滄鐨勫唴瀹�
 	 * 
@@ -354,16 +389,24 @@
 	 * @param idfa
 	 *            -IOS鐨刬dfa骞垮憡鏍囪瘑淇℃伅
 	 */
-	public void taoBaoGuessUserLikeByDevice(AcceptData acceptData, int page, HttpServletRequest request, PrintWriter out) {
+	public void taoBaoGuessUserLikeByDevice(AcceptData acceptData, int page, HttpServletRequest request,
+			PrintWriter out) {
 		int pageSize = Constant.PAGE_SIZE;
 		JSONArray array = new JSONArray();
 		Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
-		
+
 		String idfa = acceptData.getIdfa();
 		String imei = acceptData.getImei();
 		if (VersionUtil.greaterThan_1_5_70(acceptData.getPlatform(), acceptData.getVersion())) {
 			List<TaoBaoGoodsBrief> goodsList = homeRecommendGoodsService.listGoodsByPage(null, acceptData.getDevice(),
 					imei, idfa, page);
+
+			if (page < 4) {// 鍓嶄笁椤靛姞鍏ユ洿鏂�
+				try {
+					taoBaoGoodsUpdateService.addUpdateQueueAsync(goodsList);
+				} catch (Exception e) {
+				}
+			}
 
 			BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 			BigDecimal shareRate = hongBaoManageService.getShareRate();
@@ -385,20 +428,22 @@
 					for (int i = list.size() - 1; i >= 0; i--) {
 						TLJBuyGoods goods = list.get(i);
 						BigDecimal rateBuy = TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE;
-						GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods.getGoods(), null, rateBuy, rateBuy);
-						
-						String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(goods.getGoods(),TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
-						
+						GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods.getGoods(), null, rateBuy,
+								rateBuy);
+
+						String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(goods.getGoods(),
+								TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
+
 						ReduceHongBao reduceHongBao = new ReduceHongBao();
 						reduceHongBao.setLeft(goods.getLeftHongBaoCount());
 						reduceHongBao.setMoney(hongBao);
-						reduceHongBao.setName("浠樻绔嬪噺 " + hongBao);
+						reduceHongBao.setName("浠樻绔嬪噺 ");
 						reduceHongBao.setTip("");
 						reduceHongBao.setTotal(goods.getTotalHongBaoCount());
-						
+
 						OtherInfo otherInfo = new OtherInfo();
 						otherInfo.setReduceHongBao(reduceHongBao);
-						
+
 						detailVO.setOtherInfo(otherInfo);
 						detailVO.setPictureTag(new ClientTextStyleVO("绔嬪噺TOP" + (i + 1), "#E5005C", "#FCE431", null));
 						detailVO.setRecommend(true);
@@ -438,20 +483,21 @@
 					if (gList != null) {
 						BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 						BigDecimal shareRate = hongBaoManageService.getShareRate();
-						
+
 						for (TaoBaoGoodsBrief goods : gList) {
 							if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null
 									&& goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0
 									&& goods.getBiz30day() > 1000
 									&& !StringUtil.isNullOrEmpty(goods.getPictUrlWhite())) {
-								
-								GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate);
+
+								GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate,
+										shareRate);
 								detailVO.setRecommend(true);
 								goodsList.add(detailVO);
 							}
 						}
 					}
-					
+
 					try {
 						monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0,
 								(int) (java.lang.System.currentTimeMillis() - startTime), "鎺ㄨ崘鏁伴噺:" + goodsList.size()));
@@ -488,142 +534,73 @@
 		data.put("count", 1000);
 		out.print(JsonUtil.loadTrueResult(data));
 	}
-	
-	
-	
+
 	/**
-	 * 绮樿创鏉夸俊鎭帹鑽�
+	 * 浜笢棣栭〉鍟嗗搧
 	 * 
 	 * @param acceptData
-	 * @param url
-	 *            鍟嗗搧閾炬帴
+	 * @param page
 	 * @param out
 	 */
-	@RequestMapping(value = "getNewGoodsInfo", method = RequestMethod.POST)
-	public void getNewGoodsInfo(AcceptData acceptData, String text, PrintWriter out) {
-		if (StringUtil.isNullOrEmpty(text)) {
-			out.print(JsonUtil.loadFalseResult("鍊间负绌�"));
-			return;
-		}
-
-		if (text.length() > 256) {
-			out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
-			return;
-		}
-
-		TaoBaoGoodsBrief tb = null;
-		String URL_REGEX = "(((http|https)://)|(www\\.))[a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6}(:[0-9]{1,4})?(/[a-zA-Z0-9\\&%_\\./-~-]*)?";
-
-		Pattern p = Pattern.compile(URL_REGEX);
-		Matcher matcher = p.matcher(text);
-		if (!matcher.find()) {// 涓嶅寘鍚摼鎺�
-			// 鍟嗗搧璇︽儏
-			// 鍙戠幇
-			// 娌℃湁閾炬帴锛屾爣棰樿繃闀夸篃涓嶅鐞�
-			if (text.startsWith("銆�") && text.contains("銆�")) {
-				int end = text.indexOf("銆�");
-				if (end > 2)
-					text = text.substring(1, end);
+	private void getIndexJDGoods(AcceptData acceptData, int page, PrintWriter out) {
+		JDSearchResult result = jdGoodsService.getIndexJDGoods(page);
+		long count = 0;
+		JSONObject data = new JSONObject();
+		JSONArray array = new JSONArray();
+		if (result != null) {
+			PageEntity pageEntity = result.getPageEntity();
+			if (pageEntity != null) {
+				count = pageEntity.getTotalCount();
 			}
 
-			LogHelper.test("鏍规嵁绮樿创鏉挎帹鑽�:"+text);
-
-			if (text.length() > 80) {
-				out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
-				return;
-			}
-
-			SearchFilter sf = new SearchFilter();
-			sf.setKey(text);
-			JSONObject root = new JSONObject();
-
-			TaoBaoSearchResult result = TaoBaoUtil.search(sf);
-			if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0)
-				for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {
-					// 鏄睘浜庢窐瀹濊仈鐩熷晢鍝�
-					if (goods.getTitle().equalsIgnoreCase(text)) {
-						root.put("type", 2);
-						JSONObject data = new JSONObject();
-						data.put("title", goods.getTitle());
-						root.put("data", data);
-						out.print(JsonUtil.loadTrueResult(root));
-						return;
-					}
+			List<JDGoods> goodsList = result.getGoodsList();
+			if (goodsList != null && goodsList.size() > 0) {
+				BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+				BigDecimal shareRate = hongBaoManageService.getShareRate();
+				Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+						.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+				for (JDGoods goods : goodsList) {
+					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
+					array.add(gson.toJson(goodsDetailVO));
 				}
-
-			// 鏌ヨ澶ф窐瀹㈡爣棰�
-			List<DaTaoKeDetail> list = daTaoKeGoodsDetailService.listByDtitle(text);
-			if (list != null && list.size() > 0) {
-				root.put("type", 2);
-				JSONObject data = new JSONObject();
-				data.put("title", list.get(0).getdTitle());
-				root.put("data", data);
-				out.print(JsonUtil.loadTrueResult(root));
-				return;
 			}
-
-			out.print(JsonUtil.loadFalseResult("鏆備笉鏀寔璇ョ被鍨嬶紒"));
-			return;
 		}
 
-		text = matcher.group();
-		if (text.contains("ju.taobao.com") || text.contains(".juhuasuan.com")) {// 鑱氬垝绠�
-			int index = text.indexOf("item_id");
-			if (index < 0) {
-				out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
-				return;
+		data.put("list", array);
+		data.put("count", count);
+		out.print(JsonUtil.loadTrueResult(data));
+	}
+
+	/**
+	 * 鐖嗘鎺掕鍟嗗搧-瀹炴椂鐑攢姒�
+	 * 
+	 * @param acceptData
+	 * @param page
+	 * @param out
+	 */
+	private void getIndexPDDGoods(AcceptData acceptData, int page, PrintWriter out) {
+		PDDGoodsResult result = pddGoodsService.getTopGoodsList(page, 1);
+		int count = 0;
+		JSONArray array = new JSONArray();
+		if (result != null) {
+			count = result.getTotalCount();
+			Gson gson = JsonUtil.getApiCommonGson();
+			List<PDDGoodsDetail> goodsList = result.getGoodsList();
+			if (goodsList != null && goodsList.size() > 0) {
+				BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+				BigDecimal shareRate = hongBaoManageService.getShareRate();
+
+				for (PDDGoodsDetail goods : goodsList) {
+					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);
+					array.add(gson.toJson(goodsDetailVO));
+				}
 			}
-			text = text.substring(index);
-			int last = text.indexOf("&");
-			String id = "";
-			if (last > 0)
-				id = text.substring(text.indexOf("=") + 1, text.indexOf("&"));
-			else {
-				id = text.substring(text.indexOf("=" + 1));
-			}
-			tb = TaoBaoUtil.isAlimama(id);
-			if (tb == null) {
-				tb = TaoBaoUtil.parsePhoneTmAndTb(id);
-			}
-		} else if (text.contains("http://zmnxbc.com")) { // 鎵嬫満绔ぉ鐚獳PP鍒嗕韩
-			tb = TaoBaoUtil.parsePhoneShareUrlByTM(text);
-		} else if (text.contains("h5.m.taobao") || text.contains("detail.m.tmall") || text.contains("item.taobao")
-				|| text.contains("detail.tmall")) { // 鎵嬫満椤甸潰鍜岀數鑴戦〉闈�
-			Map<String, String> map = Utils.parseURL(text);
-			String id = "";
-			id = map.get("id").replace("}", "");
-			tb = TaoBaoUtil.isAlimama(id);
-			if (tb == null) {
-				tb = TaoBaoUtil.parsePhoneTmAndTb(id);
-			}
-		} else {
-			tb = TaoBaoUtil.parsePhoneShareUrlByTB(text);
 		}
 
-		if (tb != null) {
-			JSONObject data = new JSONObject();
-			JSONObject taoBaoGoodsJSON = new JSONObject();
-			taoBaoGoodsJSON.put("title", tb.getTitle());
-			taoBaoGoodsJSON.put("zkPrice", tb.getZkPrice());
-			taoBaoGoodsJSON.put("auctionId", tb.getAuctionId());
-			taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + tb.getAuctionId());
-			data.put("taoBaoGoodsBrief", taoBaoGoodsJSON);
-			if (!StringUtil.isNullOrEmpty(tb.getPictUrl())) {
-				if (tb.getImgList() == null)
-					tb.setImgList(new ArrayList<>());
-				tb.getImgList().add(0, TbImgUtil.getTBSize220Img(tb.getPictUrl()));
-			}
-			data.put("tbImgs", tb.getImgList());
-			JSONObject root = new JSONObject();
-			root.put("type", 1);
-			root.put("data", data);
-
-			out.print(JsonUtil.loadTrueResult(root));
-		}
-	
-		
-		out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
-		return;
+		JSONObject data = new JSONObject();
+		data.put("list", array);
+		data.put("count", count);
+		out.print(JsonUtil.loadTrueResult(data));
 	}
 
 }

--
Gitblit v1.8.0