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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralTaskRecordService.java

@@ -187,12 +187,6 @@
    */

   public List<IntegralTaskRecord> getSign7DaysRecord(long uid, Long cid);



   /**

    * 统计总金币

    * @param uid

    * @return

    */

   public long getTotalGoldCoinByUid(Long uid);



   /**

    * 推广红包折算金币

@@ -202,4 +196,9 @@
    */

   public void taoLiJinExchange(Long uid, Integer addGoldCoin, BigDecimal tlj);



   /**

    * 金币过期

    */

   public void invalidGoldCoin();



}