From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java |  123 +++++++++++++++++++++++++++++-----------
 1 files changed, 88 insertions(+), 35 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java
index b506ef4..ae4d415 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java
@@ -1,6 +1,7 @@
 package com.yeshi.fanli.service.inter.lable;
 
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import net.sf.json.JSONArray;
@@ -32,37 +33,6 @@
 	public List<QualityFactory> listQueryByFlashSale(long start, int count);
 	public long countQueryByFlashSale();
 	
-	
-	/**
-	 * 浠婃棩蹇呮姠 - 9k9
-	 * @param start
-	 * @param count
-	 * @param systemCid
-	 * @param labId
-	 * @param sortField
-	 * @return
-	 */
-	public List<QualityFactory> listQueryEverydayRob(long start, int count, Long cid, Long labId, Integer sortField, Double startCouponAmount, Double endCouponAmount);
-	public long countQueryEverydayRob(Long cid, Long labId,Double startCouponAmount,Double endCouponAmount);
-
-	
-
-	/**
-	 * 灏忛噾棰濇煡璇細9.9/19.9/29.9/49.9(绉诲姩绔�)
-	 * @param start
-	 * @param count
-	 * @param key
-	 * @param classId 鍒嗙被id
-	 * @param labId  鏍囩id
-	 * @return
-	 */
-	public List<QualityFactory> listQuerySmallAmount(long start, int count, String key, Long labId, String cids);
-
-	/**
-	 * 瀵瑰簲灏忛噾棰濇煡璇細9.9/19.9/29.9/49.9
-	 */
-	public long countQuerySmallAmount(String key, Long labId, String cids);
-
 	
 	/**
 	 * 鏍规嵁鍏抽敭璇嶆悳绱�
@@ -148,7 +118,6 @@
 	public long countRecommend(Double proportion, Integer startAmount, Integer couponAmount, 
 			double tkRate, Double couponRatio);
 	
-	
 	/**
 	 *  鏍规嵁鍏抽敭璇嶈繘琛屾悳绱㈠晢鍝�-鎼滅储-鎺ㄨ崘
 	 * @param start
@@ -156,9 +125,12 @@
 	 * @param key 鍏抽敭璇�
 	 * @return
 	 */
-	public List<QualityFactory> listRecommendBykey(long start, int count, String key);
+	public List<QualityFactory> listRecommendBykey(long start, int count, String key, Integer hasQuan,
+			Integer userType, Double startprice, Double endprice, Double startTkRate, Double endTkRate, Integer sort);
 	
-	public long countRecommendBykey(String key);
+	public long countRecommendBykey(String key, Integer hasQuan, Integer userType, 
+			Double startprice, Double endprice, Double startTkRate, Double endTkRate);
+	
 	
 	/**
 	 * 棣栭〉鎺ㄨ崘
@@ -167,9 +139,90 @@
 	 * @param proportion  璁＄畻姣斾緥
 	 * @return
 	 */
-	public JSONArray  getRecommendToIndex(long start, int count, String proportion, String fcRate);
+	public JSONArray  getRecommendToIndex(long start, int count, String proportion);
 	
 	public long countRecommendToIndex(String proportion);
 	
+	/**
+	 * 鍗曚釜鍟嗗搧鏍规嵁鏍囩鎺ㄨ崘鍟嗗搧
+	 * @param paramLong
+	 * @param paramString1
+	 * @param paramString2
+	 * @return
+	 */
+	public  List<QualityFactory> recommendByAuctionId(Long paramLong);
 	
+	
+
+	/**
+	 * 鍏嶅崟鍟嗗搧
+	 * @param start
+	 * @param count
+	 * @param tkRate 浣ｉ噾姣斾緥
+	 * @param lableName 鏍囩鍚�
+	 * @return
+	 */
+	public List<QualityFactory> listFreeGoods(long start, int count);
+
+	public long countFreeGoods();
+	
+	/**
+	 * 闄愭椂绉掓潃闅忔満3涓晢鍝�
+	 * @return
+	 */
+	public List<QualityFactory> listFlashSaleRandGoods();
+	
+	
+	/**
+	 * 鏍规嵁搴楅摵id鏌ヨ
+	 * @param start
+	 * @param count
+	 * @param shopId
+	 * @return
+	 */
+	public List<QualityFactory> listByShopId(long start, int count, Long shopId);
+	
+	public long countByShopId(Long shopId);
+	
+	
+	/**
+	 * 9k9绫诲晢鍝佺瓫閫�
+	 * @param start
+	 * @param count
+	 * @param biz30day
+	 * @param zkPrice
+	 * @param minQuanPrice
+	 * @param maxQuanPrice
+	 * @param cids
+	 * @return
+	 */
+	public List<QualityFactory> get9k9ClassGoods(long start, int count, Integer biz30day, BigDecimal zkPrice,
+			BigDecimal minQuanPrice, BigDecimal maxQuanPrice, String cids);
+	
+	public long count9k9ClassGoods(Integer biz30day, BigDecimal zkPrice, BigDecimal minQuanPrice, BigDecimal maxQuanPrice,
+			String cids);
+	
+	
+	/**
+	 * 9k9涓殑姣忔棩蹇呮姠
+	 * @param start
+	 * @param count
+	 * @param zkPrice
+	 * @param minQuanPrice
+	 * @param maxQuanPrice
+	 * @return
+	 */
+	public List<QualityFactory> listQueryEverydayRob(long start, int count, BigDecimal zkPrice, BigDecimal minQuanPrice,
+			BigDecimal maxQuanPrice);
+	
+	public long countQueryEverydayRob(BigDecimal zkPrice, BigDecimal minQuanPrice, BigDecimal maxQuanPrice);
+	
+	/**
+	 * 棣栭〉鎺ㄨ崘
+	 * @param start
+	 * @param count
+	 * @param proportion
+	 * @return
+	 */
+	public JSONArray getRecommendToIndexV2(long start, int count,String platform,String version);
 }

--
Gitblit v1.8.0