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/service/inter/push/PushGoodsService.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushGoodsService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushGoodsService.java
index 69ffc09..66c74bf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushGoodsService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushGoodsService.java
@@ -4,7 +4,7 @@
import java.util.List;
import com.yeshi.fanli.entity.push.PushGoods;
-import com.yeshi.fanli.exception.PushException;
+import com.yeshi.fanli.exception.push.PushException;
import com.yeshi.fanli.exception.push.PushGoodsException;
public interface PushGoodsService {
@@ -15,13 +15,13 @@
public int insertSelective(PushGoods record) throws PushGoodsException;
- public PushGoods selectByPrimaryKey(Long id) throws PushGoodsException;
+ public PushGoods selectByPrimaryKey(Long id);
public int updateByPrimaryKeySelective(PushGoods record) throws PushGoodsException;
public int updateByPrimaryKey(PushGoods record) throws PushGoodsException;
- public void save(PushGoods record, List<Long> goodsId) throws Exception;
+ public void save(PushGoods record, List<Long> goodsId) throws PushGoodsException,Exception;
/**
* 鎵归噺鍒犻櫎
@@ -61,6 +61,35 @@
* @throws PushGoodsException
* @throws PushException
*/
- public void executePush(Long id) throws Exception, PushGoodsException, PushException;
+ public void executePush(PushGoods record) throws Exception, PushGoodsException, PushException;
+
+ /**
+ * 瀹氭椂鎺ㄩ�佷换鍔�
+ * @return
+ */
+ public List<PushGoods> listTask();
+
+ /**
+ * 瀹氭椂鎺ㄩ�佸鐞�
+ * @param record
+ */
+ public void taskPush(PushGoods record);
+
+ /**
+ * 鍚庣鎺ㄩ��
+ * @param id
+ * @throws Exception
+ * @throws PushGoodsException
+ * @throws PushException
+ */
+ public void handPush(Long id) throws Exception, PushGoodsException, PushException;
+
+ /**
+ * 淇濆瓨淇℃伅
+ * @param record
+ * @throws PushGoodsException
+ * @throws Exception
+ */
+ public void saveInfo(PushGoods record) throws PushGoodsException, Exception;
}
--
Gitblit v1.8.0