fanli-server.git

			@@ -7,6 +7,7 @@
			import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
			import com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord;
			import com.yeshi.fanli.entity.system.SystemCoupon;
			import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
			import com.yeshi.fanli.exception.user.UserSystemCouponException;
			import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;
			import com.yeshi.fanli.vo.user.UserSystemCouponVO;
			@@ -127,15 +128,6 @@
			*/
			public List<UserSystemCoupon> getUserCouponBySource(Long uid, String source);

			/**
			* 插入券信息
			* @param uid
			* @param couponType
			* @param source 来源
			* @throws UserSystemCouponException
			* @throws Exception
			*/
			public UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent,Boolean needNotify) throws UserSystemCouponException, Exception;


			/**
			@@ -144,11 +136,6 @@
			*/
			public void sendBackTimeOutCoupon(Long uid);

			/**
			* 激活福利免单券
			* @param uid
			*/
			public void activatedWelfareFreeCoupon(Long uid, String from);

			/**
			* 更新券记录 ——匹配免单券
			@@ -174,14 +161,6 @@
			*/
			public void updateStateByArrivalAccount(String orderNo) throws Exception;

			/**
			* 领取未登录时已抽奖的礼品
			* @param uid
			* @param platform
			* @param device
			* @throws Exception
			*/
			public void copyLotteryPrize(Long uid, int platform, String device) throws Exception;



			@@ -192,29 +171,6 @@
			* @return
			*/
			public int countTodatyUserCouponBySource(Long uid, String source);

			/**
			* 随机生成奖励券
			* @param num
			* @param uid
			* @param source
			* @throws Exception
			*/
			public void randomRewardCoupon(int num, Long uid, String source) throws Exception;




			/**
			* 系统赠送奖励券
			* @param num
			* @param uid
			* @param source
			* @throws Exception
			*/
			public void systemGiveRewardCoupon(Long uid,int num,String orderId,Integer orderType,String reason) throws Exception;





			@@ -271,18 +227,12 @@
			public void updateCounponInvalid(List<UserSystemCoupon> list);

			/**
			* 兑换
			* 有效奖励券
			* @param uid
			* @return
			*/
			public boolean getIncludeExchange(Long uid);
			public boolean getValidRebateCoupon(Long uid);

			/**
			* 非兑换
			* @param uid
			* @return
			*/
			public boolean getIncludeNotExchange(Long uid);

			/**
			* 查询1.6.5之前的不等于35%
			@@ -330,6 +280,48 @@
			* 激活免单券---订单已到账触发激活免单券
			* @param uid
			*/
			public void triggerFreeCouponActivate(Long uid);
			public void triggerFreeCouponActivate(Long uid, String orderNo, Integer source);

			/**
			* 退回券
			* @param giveid
			*/
			public void sendBackByGiveId(Long giveid);

			/**
			* 统计赠送免单券
			* @param uid
			* @return
			*/
			public long countGiveFreeCoupon(Long uid);


			/**
			* 免单券获得
			* @param uid
			* @param typeEnum 类型
			* @param source 来源
			* @param num 数量
			* @param notify 是否发送消息
			* @return
			* @throws UserSystemCouponException
			*/
			public UserSystemCoupon freeCouponWin(Long uid, CouponTypeEnum typeEnum, String source, int num, boolean notify)
			throws UserSystemCouponException, Exception;

			/**
			* 奖励券券获得
			* @param uid
			* @param typeEnum
			* @param source
			* @param num
			* @param notify
			* @param percent
			* @return
			* @throws UserSystemCouponException
			* @throws Exception
			*/
			public UserSystemCoupon rewardCouponWin(Long uid, String source, int num, boolean notify,
			BigDecimal percent) throws UserSystemCouponException, Exception;

			}