From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java |  146 +++++++++++++++++++++++++-----------------------
 1 files changed, 76 insertions(+), 70 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java
index 056dae0..7d444ff 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java
@@ -1,71 +1,77 @@
-package com.yeshi.fanli.dao.mybatis.push;
-
-import java.util.Date;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.entity.push.PushGoods;
-
-public interface PushGoodsMapper {
-
-	int deleteByPrimaryKey(Long id);
-
-	int insert(PushGoods record);
-
-	int insertSelective(PushGoods record);
-
-	PushGoods selectByPrimaryKey(Long id);
-
-	int updateByPrimaryKeySelective(PushGoods record);
-
-	int updateByPrimaryKey(PushGoods record);
-	
-	/**
-	 * 鎵归噺鍒犻櫎
-	 * @param list
-	 * @return
-	 */
-	int deleteBatchByPrimaryKey(List<Long> list);
-	
-	/**
-	 * 鍚庣鍒楄〃鏌ヨ
-	 * @param start
-	 * @param count
-	 * @param key
-	 * @return
-	 */
-	List<PushGoods> listQuery(@Param("start") long start, @Param("count") int count,
-			@Param("key") String key, @Param("state") Integer state);
-	
-	long countQuery(@Param("key") String key, @Param("state") Integer state);
-	
-	
-	/**
-	 * 鑾峰彇鍘嗗彶鎺ㄩ�佸晢鍝佷俊鎭�
-	 * @param start
-	 * @param count
-	 * @param pushTime
-	 * @return
-	 */
-	List<PushGoods> listHistoryByPushTime(@Param("start") long start, @Param("count") int count,
-		 @Param("uid") Long uid, @Param("pushTime") Date pushTime);
-	
-	/**
-	 * 缁熻鍘嗗彶鎺ㄩ�佸晢鍝佷俊鎭�
-	 * @param start
-	 * @param count
-	 * @param pushTime
-	 * @return
-	 */
-	long countHistoryByPushTime(@Param("uid") Long uid, @Param("pushTime") Date pushTime);
-	
-	/**
-	 * 鏌ヨ宸叉帹閫佽褰�
-	 * @param list
-	 * @return
-	 */
-	List<PushGoods>  listByPushState(List<Long> list);
-	
-	
+package com.yeshi.fanli.dao.mybatis.push;
+
+import java.util.Date;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.entity.push.PushGoods;
+
+public interface PushGoodsMapper {
+
+	int deleteByPrimaryKey(Long id);
+
+	int insert(PushGoods record);
+
+	int insertSelective(PushGoods record);
+
+	PushGoods selectByPrimaryKey(Long id);
+
+	int updateByPrimaryKeySelective(PushGoods record);
+
+	int updateByPrimaryKey(PushGoods record);
+	
+	/**
+	 * 鎵归噺鍒犻櫎
+	 * @param list
+	 * @return
+	 */
+	int deleteBatchByPrimaryKey(List<Long> list);
+	
+	/**
+	 * 鍚庣鍒楄〃鏌ヨ
+	 * @param start
+	 * @param count
+	 * @param key
+	 * @return
+	 */
+	List<PushGoods> listQuery(@Param("start") long start, @Param("count") int count,
+			@Param("key") String key, @Param("state") Integer state);
+	
+	long countQuery(@Param("key") String key, @Param("state") Integer state);
+	
+	
+	/**
+	 * 鑾峰彇鍘嗗彶鎺ㄩ�佸晢鍝佷俊鎭�
+	 * @param start
+	 * @param count
+	 * @param pushTime
+	 * @return
+	 */
+	List<PushGoods> listHistoryByPushTime(@Param("start") long start, @Param("count") int count,
+		 @Param("uid") Long uid, @Param("pushTime") Date pushTime);
+	
+	/**
+	 * 缁熻鍘嗗彶鎺ㄩ�佸晢鍝佷俊鎭�
+	 * @param start
+	 * @param count
+	 * @param pushTime
+	 * @return
+	 */
+	long countHistoryByPushTime(@Param("uid") Long uid, @Param("pushTime") Date pushTime);
+	
+	/**
+	 * 鏌ヨ宸叉帹閫佽褰�
+	 * @param list
+	 * @return
+	 */
+	List<PushGoods>  listByPushState(List<Long> list);
+	
+	
+	/**
+	 * 闇�瑕佹墽琛屾帹閫佺殑浠诲姟
+	 * @return
+	 */
+	List<PushGoods> listTask();
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0