From 5e88359d7210039a6b1525bd5ffc20f24f2b5e01 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 08 五月 2019 16:13:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
index ca359e9..3e0c5e3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
@@ -456,6 +456,8 @@
 	}
 
 	private static List<DaTaoKeDetail> parseCurrent(String url) {
+		
+		List<DaTaoKeDetail> list=new ArrayList<>();
 		try {
 			Document doc = Jsoup.connect(url)
 					.userAgent(
@@ -469,6 +471,10 @@
 						.getElementsByTag("b").get(0).text();
 
 				System.out.println(id + "-" + currentSale);
+				DaTaoKeDetail detail=new DaTaoKeDetail();
+				detail.setId(id);
+				detail.setSalesNum(Integer.parseInt(currentSale));
+				list.add(detail);
 
 			}
 
@@ -477,7 +483,7 @@
 		}
 
 		// TODO 闇�瑕佽繑鍥炲��
-		return null;
+		return list;
 	}
 
 	// 鑾峰彇瀹炴椂姒滃崟
@@ -487,7 +493,7 @@
 	 * @param cid
 	 * @return
 	 */
-	public static List<DaTaoKeDetail> getCurrentSalesRank(Long cid) {
+	public static List<DaTaoKeDetail> getCurrentSalesRank(Integer cid) {
 		String url = null;
 		if (cid == null)
 			url = "http://www.dataoke.com/top_sell";
@@ -502,7 +508,7 @@
 	 * @param cid
 	 * @return
 	 */
-	public static List<DaTaoKeDetail> getCurrentDaySalesRank(Long cid) {
+	public static List<DaTaoKeDetail> getCurrentDaySalesRank(Integer cid) {
 		String url = null;
 		if (cid == null)
 			url = "http://www.dataoke.com/top_all";

--
Gitblit v1.8.0