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

admin

2020-03-12 7a40d9ca41da29aee9464f545e10b452a1922c32

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

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



   /**

@@ -96,6 +96,16 @@
    */

   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;

   

   

}