Merge remote-tracking branch 'origin/master'

admin

2019-02-27 ad3119f7b7e0375a8363b900346284bb1c274a3d

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

@@ -17,5 +17,13 @@
   public UserSystemCouponRecord getRecordByOrderNo(String orderNo, Integer state);



   public List<UserSystemCouponRecord> getRecordByOrderNoList(List<String> list);



   /**

    * 查询正在使用中 超过时间仍未匹配到订单记录

    * @param uid

    * @param seconds

    * @return

    */

   public List<UserSystemCouponRecord> getCouponByUsingTimeOut(Long uid, long seconds);

   

}