From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java |  164 +++++++++++++++++++++++++++---------------------------
 1 files changed, 83 insertions(+), 81 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java
index e87a922..7c676e6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java
@@ -1,25 +1,17 @@
 package com.yeshi.fanli.dao.mybatis.lable;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.yeshi.fanli.dao.BaseMapper;
 import com.yeshi.fanli.entity.bus.lable.QualityFactory;
+import com.yeshi.fanli.vo.quality.QualityFactoryVO;
 
-public interface QualityFactoryMapper {
+public interface QualityFactoryMapper extends BaseMapper<QualityFactory>{
 
-	int deleteByPrimaryKey(Long id);
-
-	int insert(QualityFactory record);
-
-	int insertSelective(QualityFactory record);
-
-	QualityFactory selectByPrimaryKey(Long id);
-
-	int updateByPrimaryKeySelective(QualityFactory record);
-
-	int updateByPrimaryKey(QualityFactory record);
 
 	/**
 	 * 鎵归噺鎻掑叆
@@ -44,6 +36,13 @@
 	 * @return
 	 */
 	int deleteBatchByPrimaryKey(List<Long> list);
+	
+	
+	/**
+	 * 鏍规嵁鍟嗗搧id 鎵归噺鍒犻櫎
+	 * @param list
+	 */
+	void deleteBatchByGoodsId(List<Long> list);
 
 	/**
 	 * 缁熻鎬昏鏁�
@@ -53,6 +52,15 @@
 	Long countTotalRows(@Param("days") Integer days);
 
 	List<QualityFactory> queryByGoodsId(@Param("goodsId") Long goodsId);
+	
+	
+	/**
+	 * 鏍规嵁鍟嗗搧id鏌ヨ
+	 * @param auctionId
+	 * @return
+	 */
+	QualityFactory getByAuctionId(@Param("auctionId") Long auctionId);
+	
 
 	/**
 	 * 鏍规嵁澶氫釜鍟嗗搧id 鏌ヨ瀵瑰簲鐨勫晢鍝佷俊鎭�
@@ -69,60 +77,10 @@
 	// 绮鹃�夊簱鏌ヨ -- 鏌ヨ鎵�鏈�
 	List<QualityFactory> queryAll(@Param("start") long start, @Param("count") int count, @Param("days") Integer days);
 
-	// 寰呮洿鏂扮簿閫夊晢鍝乮d
-	List<Long> queryNeedUpdate(@Param("start") long start, @Param("count") int count, @Param("hour") int hour);
-
-	// 缁熻闇�鏇存柊鍟嗗搧鏁伴噺
-	long countQueryNeedUpdate();
-
 	// 绮鹃�夊簱鏌ヨ
-	List<QualityFactory> query(@Param("start") long start, @Param("count") int count, @Param("key") String key,
-			// 鎺掑簭瀛楁 锛氶攢閲忋�佷环鏍笺�佷剑閲�
-			@Param("totalSales") Integer totalSales, @Param("price") Integer price, @Param("tkRate") Integer tkRate,
-			// 鍟嗗搧鏉ユ簮銆佸叆搴撴椂闂�
-			@Param("propor") Integer propor, @Param("goodsSource") Integer goodsSource, @Param("days") Integer days,
-			// 鍦ㄥ敭浠疯寖鍥�
-			@Param("startZkPrice") Integer startZkPrice, @Param("endZkPrice") Integer endZkPrice,
-			// 鏈堥攢閲忚寖鍥�
-			@Param("startBiz30day") Integer startBiz30day, @Param("endBiz30day") Integer endBiz30day,
-			// 鏉冮噸鑼冨洿
-			@Param("startWeight") Integer startWeight, @Param("endWeight") Integer endWeight,
-			// 浣i噾姣斾緥鑼冨洿
-			@Param("startTkRate") Integer startTkRate, @Param("endTkRate") Integer endTkRate,
-			// 鍒搁潰棰濓細鍑忓灏�
-			@Param("startAmount") Integer startAmount, @Param("endAmount") Integer endAmount,
-			// 鏄惁锛� 浼樻儬鍒� 銆佸寘閭�
-			@Param("hasCoupon") Integer hasCoupon, @Param("freeShipment") Integer freeShipment,
-			// 鏄惁锛氭秷璐硅�呬繚闅� 銆佹垚浜よ浆鍖�
-			@Param("isPrepay") Integer isPrepay, @Param("payRate30") Integer payRate30,
-			// 鏄惁锛氬ソ璇勭巼銆� 閫�娆剧巼
-			@Param("goodRate") Integer goodRate, @Param("rfdRate") Integer rfdRate,
-			// 鍒告瘮渚嬶細 鍒搁潰鍊�/鍦ㄥ敭浠�
-			@Param("startPropor") Integer startPropor, @Param("endPropor") Integer endPropor,
-			// 绫荤洰id 鎼滅储姝ょ被鍨�
-			@Param("gcid") Long gcid, @Param("keyType") Integer keyType);
+	List<QualityFactory> query(QualityFactoryVO qualityFactoryVO);
 
-	long queryCount(@Param("key") String key, @Param("goodsSource") Integer goodsSource, @Param("days") Integer days,
-			// 鍦ㄥ敭浠疯寖鍥�
-			@Param("startZkPrice") Integer startZkPrice, @Param("endZkPrice") Integer endZkPrice,
-			// 鏈堥攢閲忚寖鍥�
-			@Param("startBiz30day") Integer startBiz30day, @Param("endBiz30day") Integer endBiz30day,
-			// 鏉冮噸鑼冨洿
-			@Param("startWeight") Integer startWeight, @Param("endWeight") Integer endWeight,
-			// 浣i噾姣斾緥鑼冨洿
-			@Param("startTkRate") Integer startTkRate, @Param("endTkRate") Integer endTkRate,
-			// 鍒搁潰棰濓細鍑忓灏�
-			@Param("startAmount") Integer startAmount, @Param("endAmount") Integer endAmount,
-			// 鏄惁锛� 浼樻儬鍒� 銆佸寘閭�
-			@Param("hasCoupon") Integer hasCoupon, @Param("freeShipment") Integer freeShipment,
-			// 鏄惁锛氭秷璐硅�呬繚闅� 銆佹垚浜よ浆鍖�
-			@Param("isPrepay") Integer isPrepay, @Param("payRate30") Integer payRate30,
-			// 鏄惁锛氬ソ璇勭巼銆� 閫�娆剧巼
-			@Param("goodRate") Integer goodRate, @Param("rfdRate") Integer rfdRate,
-			// 鍒告瘮渚嬶細 鍒搁潰鍊�/鍦ㄥ敭浠�
-			@Param("startPropor") Integer startPropor, @Param("endPropor") Integer endPropor,
-			// 绫荤洰id
-			@Param("gcid") Long gcid, @Param("keyType") Integer keyType);
+	long queryCount(QualityFactoryVO qualityFactoryVO);
 
 	/**
 	 * 缁熻鍟嗗搧鏁伴噺
@@ -191,23 +149,7 @@
 	 */
 	int removeStorageGoods(String doTime, Long gcids);
 
-	/**
-	 * 浠婃棩蹇呮姠 - 9k9
-	 * 
-	 * @param start
-	 * @param count
-	 * @param systemCid
-	 * @param labId
-	 * @param sortField
-	 * @return
-	 */
-	List<QualityFactory> listQueryEverydayRob(@Param("start") long start, @Param("count") int count,
-			@Param("systemCid") Long systemCid, @Param("labId") Long labId, @Param("sortField") Integer sortField,
-			@Param("startCouponAmount") Double startCouponAmount, @Param("endCouponAmount") Double endCouponAmount);
-
-	long countQueryEverydayRob(@Param("systemCid") Long systemCid, @Param("labId") Long labId,
-			@Param("startCouponAmount") Double startCouponAmount, @Param("endCouponAmount") Double endCouponAmount);
-
+	
 	/**
 	 * 瀛愮被鏌ヨ
 	 * 
@@ -260,6 +202,12 @@
 
 	long countQueryByFlashSale();
 
+	/**
+	 * 闄愭椂绉掓潃 闅忔満3涓晢鍝�
+	 * @return
+	 */
+	List<QualityFactory> listFlashSaleRandGoods();
+	
 	/**
 	 * 杩斿埄閲戦鏁版嵁鏌ヨ
 	 * 
@@ -356,4 +304,58 @@
 	List<QualityFactory> listByMinSalesCountOrderByCreateTimeDesc(@Param("salesCount") int salesCount,
 			@Param("start") long start, @Param("count") int count);
 
+	/**
+	 * 鎸夋渶浣庨攢閲忓�掑彊鎺掑垪
+	 * 
+	 * @param salesCount
+	 * @param start
+	 * @param count
+	 * @return
+	 */
+	List<QualityFactory> listFreeGoods(@Param("start") long start, @Param("count") int count);
+	
+	long countFreeGoods();
+
+	
+	/**
+	 * 鏍规嵁搴楅摵淇℃伅鑾峰彇鍟嗗搧
+	 * @param start
+	 * @param count
+	 * @param shopId
+	 * @return
+	 */
+	List<QualityFactory> listByShopId(@Param("start") long start, @Param("count") int count, 
+			@Param("shopId") Long shopId);
+	
+	long countByShopId(@Param("shopId") Long shopId);
+	
+	
+	
+	/**
+	 * 9k9绫�
+	 * 
+	 */
+	List<QualityFactory> get9k9ClassGoods(@Param("start") long start, @Param("count") int count,
+			@Param("biz30day") Integer biz30day, @Param("zkPrice") BigDecimal zkPrice,
+			@Param("minQuanPrice") BigDecimal minQuanPrice, @Param("maxQuanPrice") BigDecimal maxQuanPrice,
+			@Param("cids") String cids);
+
+	long count9k9ClassGoods(@Param("biz30day") Integer biz30day, @Param("zkPrice") BigDecimal zkPrice,
+			@Param("minQuanPrice") BigDecimal minQuanPrice, @Param("maxQuanPrice") BigDecimal maxQuanPrice
+			,@Param("cids") String cids);
+
+	
+	
+	/**
+	 * 浠婃棩蹇呮姠 - 9k9
+	 * 
+	 */
+	List<QualityFactory> listQueryEverydayRob(@Param("start") long start, @Param("count") int count,
+			@Param("zkPrice") BigDecimal zkPrice,
+			@Param("minQuanPrice") BigDecimal minQuanPrice, @Param("maxQuanPrice") BigDecimal maxQuanPrice);
+	
+	long countQueryEverydayRob(@Param("zkPrice") BigDecimal zkPrice,
+			@Param("minQuanPrice") BigDecimal minQuanPrice, @Param("maxQuanPrice") BigDecimal maxQuanPrice);
+
+
 }

--
Gitblit v1.8.0