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

admin

2019-08-27 e6764831a890de26fcfebb4fb8f3a22e9f8cc816

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

@@ -65,21 +65,21 @@
    */

   List<UserSystemCoupon> getCouponByTypeAndNotActivated(@Param("uid") Long uid, @Param("couponId") Long couponId);

   

//   /**

//    *  查询兑换的券

//    * @param uid

//    * @param source

//    * @return

//    */

//   List<UserSystemCoupon> countIncludeExchange(@Param("uid") Long uid, @Param("source") String source);

//	
//	
//   /**

//    *  查询排出兑换的券

//    * @param uid

//    * @param source

//    * @return

//    */

//   List<UserSystemCoupon> countNotIncludeExchange(@Param("uid") Long uid, @Param("source") String source);

//	
   /**

    *  查询兑换的券

    * @param uid

    * @param source

    * @return

    */

   List<UserSystemCoupon> getIncludeExchange(@Param("uid") Long uid, @Param("list") List<String> list);

	
	
   /**

    *  查询排出兑换的券

    * @param uid

    * @param source

    * @return

    */

   List<UserSystemCoupon> getIncludeNotExchange(@Param("uid") Long uid,@Param("list") List<String> list);

	
}