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 |   89 +++++++++++++++++++++++++-------------------
 1 files changed, 51 insertions(+), 38 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 eb58fe9..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,26 +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);
 
 	/**
 	 * 鎵归噺鎻掑叆
@@ -45,6 +36,13 @@
 	 * @return
 	 */
 	int deleteBatchByPrimaryKey(List<Long> list);
+	
+	
+	/**
+	 * 鏍规嵁鍟嗗搧id 鎵归噺鍒犻櫎
+	 * @param list
+	 */
+	void deleteBatchByGoodsId(List<Long> list);
 
 	/**
 	 * 缁熻鎬昏鏁�
@@ -54,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,12 +76,6 @@
 
 	// 绮鹃�夊簱鏌ヨ -- 鏌ヨ鎵�鏈�
 	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(QualityFactoryVO qualityFactoryVO);
@@ -148,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);
-
+	
 	/**
 	 * 瀛愮被鏌ヨ
 	 * 
@@ -327,10 +312,9 @@
 	 * @param count
 	 * @return
 	 */
-	List<QualityFactory> listFreeGoods(@Param("start") long start, @Param("count") int count, 
-			@Param("tkRate") Double tkRate, @Param("lableName") String lableName);
+	List<QualityFactory> listFreeGoods(@Param("start") long start, @Param("count") int count);
 	
-	long countFreeGoods(@Param("tkRate") Double tkRate, @Param("lableName") String lableName);
+	long countFreeGoods();
 
 	
 	/**
@@ -344,5 +328,34 @@
 			@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