From 59bfbce44674e52aefbe883233ffaea93d750a8f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 09:56:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/dataoke/DaTaoKeDetailMapper.java |  210 ++++++++++++++++++++++++++--------------------------
 1 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/dataoke/DaTaoKeDetailMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/dataoke/DaTaoKeDetailMapper.java
index 6454a0d..7e5d18a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/dataoke/DaTaoKeDetailMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/dataoke/DaTaoKeDetailMapper.java
@@ -1,106 +1,106 @@
-package com.yeshi.fanli.dao.mybatis.taobao.dataoke;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
-
-public interface DaTaoKeDetailMapper extends BaseMapper<DaTaoKeDetail> {
-
-	/**
-	 * 鏍规嵁ID鎵归噺鍒犻櫎
-	 * 
-	 * @param ids
-	 * @return
-	 */
-	int deleteByIdList(@Param("ids") List<Long> ids);
-
-	/**
-	 * 鎵归噺鎻掑叆
-	 * 
-	 * @param detailList
-	 * @return
-	 */
-	int insertByBatch(@Param("detailList") List<DaTaoKeDetail> detailList);
-
-	/**
-	 * 閫氳繃鏈�灏忔洿鏂版椂闂村仛鍒犻櫎
-	 * 
-	 * @return
-	 */
-	int deleteByMinUpdateTime(Long minTime);
-
-	/**
-	 * 鏍规嵁鍟嗗搧ID鍒楄〃鏌ヨ
-	 * 
-	 * @param goodsIdList
-	 * @return
-	 */
-	List<DaTaoKeDetail> listByGoodsIds(@Param("goodsIdList") List<Long> goodsIdList);
-
-	/**
-	 * 鏍规嵁涓婚敭ID鏌ヨ
-	 * 
-	 * @param idList
-	 * @return
-	 */
-	List<DaTaoKeDetail> listByIds(@Param("idList") List<Long> idList);
-
-	/**
-	 * 鍙栧嚭鏈�鏂扮殑id
-	 * 
-	 * @param ids
-	 * @return
-	 */
-	List<DaTaoKeDetail> getGoodsNotInList(@Param("cid") Long cid, @Param("list") List<Long> list,
-			@Param("count") int count);
-
-	/**
-	 * 鏍规嵁鏍囬鏌ヨ
-	 * 
-	 * @param dtitle
-	 * @return
-	 */
-	List<DaTaoKeDetail> listByDtitle(String dtitle);
-
-	/**
-	 * 鏍规嵁鏍囬涓庡垎绫绘悳绱㈠垪琛�
-	 * 
-	 * @param title
-	 * @param cid
-	 * @param start
-	 * @param count
-	 * @return
-	 */
-	List<DaTaoKeDetail> listSearchByTitleWithCid(@Param("title") String key, @Param("cid") Long cid,
-			@Param("start") long start, @Param("count") int count);
-
-	/**
-	 * 鏍规嵁鏍囬涓庡垎绫昏幏鍙栨悳绱㈠垪琛ㄦ暟閲�
-	 * 
-	 * @param title
-	 * @param cid
-	 * @return
-	 */
-	Long countSearchByTitleWithCid(@Param("title") String key, @Param("cid") Long cid);
-
-	/**
-	 * 鏍规嵁搴楅摵id鏌ヨ
-	 * 
-	 * @param start
-	 * @param count
-	 * @param sellerId
-	 * @return
-	 */
-	public List<DaTaoKeDetail> listBySellerId(@Param("start") long start, @Param("count") int count,
-			@Param("sellerId") Long sellerId);
-
-	List<DaTaoKeDetail> listByCidAndMaxMinPrice(@Param("cid") Integer cid, @Param("maxPrice") BigDecimal maxPrice,
-			@Param("minPrice") BigDecimal minPrice, @Param("start") long start, @Param("count") int count);
-
-	Long countByCidAndMaxMinPrice(@Param("cid") Integer cid, @Param("maxPrice") BigDecimal maxPrice,
-			@Param("minPrice") BigDecimal minPrice);
+package com.yeshi.fanli.dao.mybatis.taobao.dataoke;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
+
+public interface DaTaoKeDetailMapper extends BaseMapper<DaTaoKeDetail> {
+
+	/**
+	 * 鏍规嵁ID鎵归噺鍒犻櫎
+	 * 
+	 * @param ids
+	 * @return
+	 */
+	int deleteByIdList(@Param("ids") List<Long> ids);
+
+	/**
+	 * 鎵归噺鎻掑叆
+	 * 
+	 * @param detailList
+	 * @return
+	 */
+	int insertByBatch(@Param("detailList") List<DaTaoKeDetail> detailList);
+
+	/**
+	 * 閫氳繃鏈�灏忔洿鏂版椂闂村仛鍒犻櫎
+	 * 
+	 * @return
+	 */
+	int deleteByMinUpdateTime(Long minTime);
+
+	/**
+	 * 鏍规嵁鍟嗗搧ID鍒楄〃鏌ヨ
+	 * 
+	 * @param goodsIdList
+	 * @return
+	 */
+	List<DaTaoKeDetail> listByGoodsIds(@Param("goodsIdList") List<Long> goodsIdList);
+
+	/**
+	 * 鏍规嵁涓婚敭ID鏌ヨ
+	 * 
+	 * @param idList
+	 * @return
+	 */
+	List<DaTaoKeDetail> listByIds(@Param("idList") List<Long> idList);
+
+	/**
+	 * 鍙栧嚭鏈�鏂扮殑id
+	 * 
+	 * @param ids
+	 * @return
+	 */
+	List<DaTaoKeDetail> getGoodsNotInList(@Param("cid") Long cid, @Param("list") List<Long> list,
+			@Param("count") int count);
+
+	/**
+	 * 鏍规嵁鏍囬鏌ヨ
+	 * 
+	 * @param dtitle
+	 * @return
+	 */
+	List<DaTaoKeDetail> listByDtitle(String dtitle);
+
+	/**
+	 * 鏍规嵁鏍囬涓庡垎绫绘悳绱㈠垪琛�
+	 * 
+	 * @param title
+	 * @param cid
+	 * @param start
+	 * @param count
+	 * @return
+	 */
+	List<DaTaoKeDetail> listSearchByTitleWithCid(@Param("title") String key, @Param("cid") Long cid,
+			@Param("start") long start, @Param("count") int count);
+
+	/**
+	 * 鏍规嵁鏍囬涓庡垎绫昏幏鍙栨悳绱㈠垪琛ㄦ暟閲�
+	 * 
+	 * @param title
+	 * @param cid
+	 * @return
+	 */
+	Long countSearchByTitleWithCid(@Param("title") String key, @Param("cid") Long cid);
+
+	/**
+	 * 鏍规嵁搴楅摵id鏌ヨ
+	 * 
+	 * @param start
+	 * @param count
+	 * @param sellerId
+	 * @return
+	 */
+	public List<DaTaoKeDetail> listBySellerId(@Param("start") long start, @Param("count") int count,
+			@Param("sellerId") Long sellerId);
+
+	List<DaTaoKeDetail> listByCidAndMaxMinPrice(@Param("cid") Integer cid, @Param("maxPrice") BigDecimal maxPrice,
+			@Param("minPrice") BigDecimal minPrice, @Param("start") long start, @Param("count") int count);
+
+	Long countByCidAndMaxMinPrice(@Param("cid") Integer cid, @Param("maxPrice") BigDecimal maxPrice,
+			@Param("minPrice") BigDecimal minPrice);
 }
\ No newline at end of file

--
Gitblit v1.8.0