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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinRecordService.java

@@ -21,7 +21,7 @@
    * @throws UserTaoLiJinRecordException

    */

   public UserTaoLiJinRecord createUserTaoLiJin(int origin, Long uid, Long auctionId, BigDecimal perface, int totalNum, String name, Date sendStartTime,

         Date sendEndTime, Date useStartTime, Date useEndTime) throws UserTaoLiJinRecordException;

         Date sendEndTime, Date useStartTime, Date useEndTime,String pid) throws UserTaoLiJinRecordException;



   

   /**

@@ -34,6 +34,13 @@
    */

   public List<UserTaoLiJinRecordVO> getRecordByUid(long start, int count, Long uid);



   /**

    * 统计创建记录条数

    * @param uid

    * @return

    */

   public long countShareRecordByUid(Long uid);

	


   /**

    * 统计创建次数

@@ -76,7 +83,7 @@
    * @return

    * @throws UserTaoLiJinRecordException

    */

   public UserTaoLiJinRecord createSelfBuyTaoLiJin(Long uid, int totalNum, TaoBaoGoodsBrief goods)

   public UserTaoLiJinRecord createSelfBuyTaoLiJin(Long uid, BigDecimal couplePrice, TaoBaoGoodsBrief goods)

         throws UserTaoLiJinRecordException;



   /**

@@ -89,4 +96,17 @@
    */

   public UserTaoLiJinRecord createShareTaoLiJin(Long uid, int totalNum, TaoBaoGoodsBrief goods)

         throws UserTaoLiJinRecordException;





   /**

    * 赠送推广红包

    * @param uid

    * @param amount

    * @return

    * @throws UserTaoLiJinRecordException

    */

   public String giveTaolijin(Long uid, BigDecimal amount) throws UserTaoLiJinRecordException;

	
	
}