From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/recommend/RecommendGoodsDeleteHistoryMapper.java |   40 +++++++++++++++++++++++++++++++++-------
 1 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/recommend/RecommendGoodsDeleteHistoryMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/recommend/RecommendGoodsDeleteHistoryMapper.java
index 2800689..fd956bc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/recommend/RecommendGoodsDeleteHistoryMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/recommend/RecommendGoodsDeleteHistoryMapper.java
@@ -1,8 +1,34 @@
-package com.yeshi.fanli.dao.mybatis.goods.recommend;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.goods.recommend.RecommendGoodsDeleteHistory;
-
-public interface RecommendGoodsDeleteHistoryMapper extends BaseMapper<RecommendGoodsDeleteHistory> {
-
+package com.yeshi.fanli.dao.mybatis.goods.recommend;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.goods.recommend.RecommendGoodsDeleteHistory;
+
+public interface RecommendGoodsDeleteHistoryMapper extends BaseMapper<RecommendGoodsDeleteHistory> {
+
+	/**
+	 * 鎵归噺鏌ヨ鍟嗗搧鏄惁鍦ㄥ垹闄ら槦鍒椾腑
+	 * 
+	 * @param goodsList
+	 * @return
+	 */
+	List<RecommendGoodsDeleteHistory> listByGoodsInfo(@Param("device") String device,
+			@Param("goodsList") List<RecommendGoodsDeleteHistory> goodsList);
+
+	
+	/**
+	 * 鍚庡彴缁熻
+	 * @param start
+	 * @param count
+	 * @param key
+	 * @return
+	 */
+	List<RecommendGoodsDeleteHistory> listBackStage(@Param("start") long start, @Param("count") int count,
+			@Param("key") String key);
+	
+	long countBackStage(@Param("key") String key);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0