Merge remote-tracking branch 'origin/release-201819-wangcz' into release-201819-wangcz

src/main/java/com/uas/platform/b2c/common/search/service/impl/SearcherServiceImpl.java

@@ -252,12 +252,8 @@ public class SearcherServiceImpl implements SearcherService {
 		}
 
 		Map<String,Object> results = null;
-		//Map<String, Object> results = new HashMap<>();
-        com.uas.platform.b2c.common.search.util.PageParams pageParams = new com.uas.platform.b2c.common.search.util.PageParams();
-        pageParams.setPage(page.getPage());
-        pageParams.setSize(page.getCount());
 		try {
-			results = searchService.getGoodsIds(keyword, pageParams);
+			results = searchService.getGoodsIds(keyword, convertPageParams(page));
 		} catch (SearchException e) {
 			throwSystemException(e);
 		}
@@ -269,8 +265,8 @@ public class SearcherServiceImpl implements SearcherService {
 
         SPage<Long> stockPage = (SPage<Long>) ((JSONObject)results.get("stock")).toJavaObject(SPage.class);
         SPage<Long> futuresPage = (SPage<Long>) ((JSONObject)results.get("futures")).toJavaObject(SPage.class);
-        for (Long goodsId : stockPage.getContent()) {
-            goodsList.add(goodsDao.findOne(goodsId));
+        for (Object goodsId : stockPage.getContent()) {
+            goodsList.add(goodsDao.findOne(Long.valueOf(goodsId.toString())));
         }
 
         for (Object PrId : futuresPage.getContent()) {