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

admin

2019-08-28 08d5529087390663115d326190635e4a4997acf2

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java

@@ -267,4 +267,19 @@
    */

   public boolean getIncludeNotExchange(Long uid);



   /**

    * 查询1.6.5之前的  不等于35%

    * @param uid

    * @return

    */

   public List<UserSystemCouponVO> listIncludeNotExchange(Long uid) throws Exception;



   public long countCouponOld(Long uid);



   /**

    * 更新用户过期券

    * @param uid

    */

   public void updateInvalidSate(Long uid);



}