From 75c913433be539038a4c45326faddc45b574f2c7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 29 五月 2019 17:30:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java |   65 +++++++++++++++++---------------
 1 files changed, 34 insertions(+), 31 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 f60e3a0..45f7456 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);
-
 	
 	/**
 	 * 鏍规嵁鍏抽敭璇嶆悳绱�
@@ -213,4 +183,37 @@
 	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);
 }

--
Gitblit v1.8.0