From ed0921d4c7e4556002c8079eeb9f3218b6357872 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期三, 14 十一月 2018 17:53:13 +0800
Subject: [PATCH] 搜索接口添加筛选比例范围

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java
index 85d9bde..6251ed3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java
@@ -422,7 +422,7 @@
 	 */
 	@RequestMapping(value = "searchgoods")
 	public void searchgoods(AcceptData acceptData, String kw, int page, String filter, String order, String startprice,
-			String endprice, String fastFilter, PrintWriter out) {
+			String endprice, Double startTkRate, Double endTkRate, String fastFilter, PrintWriter out) {
 
 		String bid = getHistorySearchBid(acceptData);
 
@@ -467,10 +467,10 @@
 		JSONObject data = null;
 		if (!recommend) {
 			// 娣樺疂鎺ュ彛璇锋眰
-			data = searchGoods(kw, page, filter, order, startprice, endprice);
+			data = searchGoods(kw, page, filter, order, startprice, endprice, startTkRate, endTkRate);
 		} else {
 			// 鎺ㄨ崘锛氱簿閫夊簱
-			data = searchQualityGoods(kw, page, filter, order, startprice, endprice);
+			data = searchQualityGoods(kw, page, filter, order, startprice, endprice, startTkRate, endTkRate);
 		}
 
 		// 鑾峰彇鎺ㄨ崘璇�
@@ -501,7 +501,7 @@
 	 * @return
 	 */
 	private JSONObject searchGoods(String kw, int page, String filter, String order, String startprice,
-			String endprice) {
+			String endprice, Double startTkRate, Double endTkRate) {
 		page = page + 1;
 
 		SearchFilter sf = new SearchFilter();
@@ -515,6 +515,20 @@
 
 		if (!com.yeshi.fanli.util.StringUtil.isNullOrEmpty(endprice)) {
 			sf.setEndPrice(new BigDecimal(endprice));
+		}
+		
+		if (startTkRate != null && startTkRate != 0 && !startTkRate.equals(0)) {
+			BigDecimal b = new BigDecimal(startTkRate/2);
+			double df = b.setScale(2, BigDecimal.ROUND_FLOOR).doubleValue();
+			int tkRate = (int) (df * 100);
+			sf.setStartTkRate(tkRate);
+		}
+		
+		if (endTkRate != null && endTkRate != 0 && !endTkRate.equals(0)) {
+			BigDecimal b = new BigDecimal(endTkRate/2);
+			double df = b.setScale(2, BigDecimal.ROUND_FLOOR).doubleValue();
+			int tkRate = (int) (df * 100);
+			sf.setEndTkRate(tkRate);
 		}
 
 		if (!com.yeshi.fanli.util.StringUtil.isNullOrEmpty(order)) {
@@ -679,7 +693,7 @@
 	 * @return
 	 */
 	private JSONObject searchQualityGoods(String key, int page, String filter, String order, String startprice,
-			String endprice) {
+			String endprice, Double startTkRate, Double endTkRate) {
 
 		Integer hasQuan = null;
 		Integer userType = null;
@@ -731,7 +745,7 @@
 		int pageSize = Constant.PAGE_SIZE;
 
 		List<QualityFactory> listQuery = qualityGoodsService.listRecommendBykey(page * pageSize, pageSize, key, hasQuan,
-				userType, start_Price, end_Price, sort);
+				userType, start_Price, end_Price, startTkRate, endTkRate, sort);
 
 		List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();
 		Map<String, String> map = manageService.convertMap();
@@ -767,7 +781,7 @@
 			}
 		}
 
-		long count = qualityGoodsService.countRecommendBykey(key, hasQuan, userType, start_Price, end_Price);
+		long count = qualityGoodsService.countRecommendBykey(key, hasQuan, userType, start_Price, end_Price, startTkRate, endTkRate);
 
 		// 璁剧疆鍙戣揣鍦板潃
 		TaoBaoSearchNav nav = new TaoBaoSearchNav();

--
Gitblit v1.8.0