Merge remote-tracking branch 'origin/master'

admin

2019-02-27 ad3119f7b7e0375a8363b900346284bb1c274a3d

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

@@ -35,6 +35,20 @@
    */
   List<UserSystemCoupon> getUserCouponBySource(@Param("uid") Long uid, @Param("source") String source);
   
   /**
    * 获取已经过期但状态未改变的券
    * @param uid
    * @return
    */
   List<UserSystemCoupon> getCounponNowInvalid(@Param("uid") Long uid);
	
   /**
    * 根据状态查询券
    * @param uid
    * @param source
    * @return
    */
   List<UserSystemCoupon> getCouponByState(@Param("uid") Long uid, @Param("state") String state);
   
   
}