From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@Admin> Date: 星期二, 18 十二月 2018 11:17:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 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..c08e07e 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 @@ -148,7 +148,6 @@ public long countRecommend(Double proportion, Integer startAmount, Integer couponAmount, double tkRate, Double couponRatio); - /** * 鏍规嵁鍏抽敭璇嶈繘琛屾悳绱㈠晢鍝�-鎼滅储-鎺ㄨ崘 * @param start @@ -156,9 +155,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 +169,16 @@ * @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); } -- Gitblit v1.8.0