From a3ea58065f61d16f06a0883737eae320eef5c33a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 15:47:12 +0800
Subject: [PATCH] 非任务模式不执行京东/拼多多订单

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 2325fdb..0e66c8f 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
@@ -49,7 +49,7 @@
 	 * @return
 	 */
 	List<PushGoods> listHistoryByPushTime(@Param("start") long start, @Param("count") int count,
-		 @Param("pushTime") Date pushTime);
+		 @Param("uid") Long uid, @Param("pushTime") Date pushTime);
 	
 	/**
 	 * 缁熻鍘嗗彶鎺ㄩ�佸晢鍝佷俊鎭�
@@ -58,7 +58,7 @@
 	 * @param pushTime
 	 * @return
 	 */
-	long countHistoryByPushTime(@Param("pushTime") Date pushTime);
+	long countHistoryByPushTime(@Param("uid") Long uid, @Param("pushTime") Date pushTime);
 	
 	/**
 	 * 鏌ヨ宸叉帹閫佽褰�
@@ -68,4 +68,10 @@
 	List<PushGoods>  listByPushState(List<Long> list);
 	
 	
+	/**
+	 * 闇�瑕佹墽琛屾帹閫佺殑浠诲姟
+	 * @return
+	 */
+	List<PushGoods> listTask();
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0