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

admin

2019-08-28 08d5529087390663115d326190635e4a4997acf2

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java

@@ -59,6 +59,13 @@
   List<UserSystemCoupon> getCounponNowInvalid(@Param("count")int count);

   

   /**

    * 获取已经过期但状态未改变的券

    * @param uid

    * @return

    */

   List<UserSystemCoupon> getCounponNowInvalidByUid(@Param("uid")Long uid);

	
   /**

    * 根据状态查询券

    * @param uid

    * @param source