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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -16,16 +16,8 @@


   public UserSystemCouponRecord getRecordByOrderNo(String orderNo, Integer state);



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

   public List<UserSystemCouponRecord> getRecordByOrderNoList(Integer source, List<String> list);



   /**

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

    * 
    * @param uid

    * @param seconds

    * @return

    */

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



   /**

    * 查询状态

@@ -42,6 +34,14 @@
    * @param orderId

    * @return

    */

   public boolean isSuccessMianDan(String orderId);

   public boolean isSuccessMianDan(Integer source, String orderId);



	
   /**

    * 查询最近记录

    * @param userCouponId

    * @return

    */

   public UserSystemCouponRecord getNearByUserCouponId(Long userCouponId);



}