Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 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;

   

   /**

    * 批量删除

@@ -49,9 +49,9 @@
    * @param pushTime

    * @return

    */

   public List<PushGoods> listHistoryByPushTime(long start, int count, Date pushTime);

   public List<PushGoods> listHistoryByPushTime(long start, int count, Long uid, Date pushTime);



   public long countHistoryByPushTime(Date pushTime);

   public long countHistoryByPushTime(Long uid, Date pushTime);



   

   /**

@@ -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;

   

}