fanli-server.git

			@@ -2,9 +2,13 @@

			import java.math.BigDecimal;

			import com.yeshi.fanli.dto.msg.MsgOtherCouponActivateDTO;
			import com.yeshi.fanli.dto.msg.MsgOtherExchangeContentDTO;
			import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
			import com.yeshi.fanli.dto.msg.MsgOtherRewardIntegralDTO;
			import com.yeshi.fanli.dto.msg.MsgOtherSystemGiveDTO;
			import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO;
			import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
			import com.yeshi.fanli.entity.bus.user.UserInfo;
			import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;

			@@ -35,7 +39,7 @@
			* @param startTime
			* @param endTime
			*/
			public void welfareCouponActive(UserSystemCoupon coupon,UserInfo worker);
			public void welfareCouponActive(UserSystemCoupon coupon, UserInfo worker);

			/**
			* 福利免单券使用中
			@@ -43,7 +47,7 @@
			* @param startTime
			* @param endTime
			*/
			public void welfareCouponUsing(UserSystemCoupon coupon,String orderId,BigDecimal money);
			public void welfareCouponUsing(UserSystemCoupon coupon, String orderId, BigDecimal money);

			/**
			* 福利免单券已被使用
			@@ -52,7 +56,7 @@
			* @param startTime
			* @param endTime
			*/
			public void welfareCouponUsed(UserSystemCoupon coupon,String orderId);
			public void welfareCouponUsed(UserSystemCoupon coupon, String orderId);

			/**
			* 福利免单券即将过期
			@@ -69,13 +73,13 @@
			* @param coupon
			*/
			public void welfareCouponAlreadyOutOfDate(UserSystemCoupon coupon);



			/**
			* 福利免单券已经退回
			*
			* @param coupon
			*/
			public void welfareCouponDrawBack(UserSystemCoupon coupon,String orderId);
			public void welfareCouponDrawBack(UserSystemCoupon coupon, String orderId);

			// 免单券

			@@ -96,7 +100,7 @@
			* @param startTime
			* @param endTime
			*/
			public void freeSheetCouponUsing(UserSystemCoupon coupon,String orderId,BigDecimal money);
			public void freeSheetCouponUsing(UserSystemCoupon coupon, String orderId, BigDecimal money);

			/**
			* 免单券已经使用
			@@ -106,7 +110,7 @@
			* @param startTime
			* @param endTime
			*/
			public void freeSheetCouponUsed(UserSystemCoupon coupon,String orderId);
			public void freeSheetCouponUsed(UserSystemCoupon coupon, String orderId);

			/**
			* 免单券即将过期
			@@ -126,31 +130,34 @@
			* @param endTime
			*/
			public void freeSheetCouponAlreadyOutOfDate(UserSystemCoupon coupon);


			/**
			* 已退回
			*
			* @param coupon
			*/
			public void freeSheetCouponDrawBack(UserSystemCoupon coupon,String orderId);
			public void freeSheetCouponDrawBack(UserSystemCoupon coupon, String orderId);

			// 奖励券


			/**
			* 奖励券获得
			* 奖励券获得
			*
			* @param coupon
			* @param percent -百分比
			* @param percent
			* -百分比
			*/
			public void rewardCouponGet(UserSystemCoupon coupon,int percent);

			public void rewardCouponGet(UserSystemCoupon coupon, int percent);

			/**
			* 奖励券使用成功
			*
			* @param coupon
			* @param oldFanLiMoney-原始返利金额
			* @param rewardMoney-奖励金额
			*/
			public void rewardCouponUsed(UserSystemCoupon coupon,BigDecimal oldFanLiMoney,BigDecimal rewardMoney,String orderId);
			public void rewardCouponUsed(UserSystemCoupon coupon, BigDecimal oldFanLiMoney, BigDecimal rewardMoney,
			String orderId);

			/**
			* 奖励券即将过期
			@@ -160,7 +167,7 @@
			* @param startTime
			* @param endTime
			*/
			public void rewardCouponWillOutOfDate(UserSystemCoupon coupon,int percent);
			public void rewardCouponWillOutOfDate(UserSystemCoupon coupon, int percent);

			/**
			* 奖励券已经过期
			@@ -171,18 +178,18 @@
			*/
			public void rewardCouponAlreadyOutOfDate(UserSystemCoupon coupon);


			/**
			* 淘礼金消息
			*
			* @param uid
			* @param beiZhu
			* @param content
			*/
			public void taoLiJinMsg(Long uid, String beiZhu, MsgOtherTaoLiJinContentDTO content);


			/**
			* 口令赠送领取
			*
			* @param uid
			* @param beiZhu
			* @param content
			@@ -191,10 +198,66 @@

			/**
			* 兑换消息
			*
			* @param uid
			* @param beiZhu
			* @param content
			*/
			public void exchangeMsg(Long uid, String beiZhu, MsgOtherExchangeContentDTO content);

			/**
			* 券退回
			*
			* @param coupon
			* @param orderId
			* @param type
			*/
			public void couponDrawBack(UserSystemCoupon coupon, String orderId, MsgTypeOtherTypeEnum type);

			/**
			* 券
			*
			* @param coupon
			* @param type
			*/
			public void outOfDate(UserSystemCoupon coupon, MsgTypeOtherTypeEnum type);

			/**
			* 免单券正在使用
			*
			* @param source
			* @param startTime
			* @param endTime
			*/
			public void couponUsingFreeSheet(UserSystemCoupon coupon, String orderId, BigDecimal money,
			MsgTypeOtherTypeEnum type);

			public void couponUsedFreeSheet(UserSystemCoupon coupon, String orderId, MsgTypeOtherTypeEnum type);

			/**
			* 赠送的免单券激活
			*
			* @param uid
			* @param beiZhu
			* @param content
			*/
			public void giveCouponActivateMsg(Long uid, String beiZhu, MsgOtherCouponActivateDTO content);

			/**
			* 队员首单奖励邀请人
			*
			* @param uid
			* @param beiZhu
			* @param content
			*/
			public void firstOrderRewardMsg(Long uid, String beiZhu, MsgOtherRewardIntegralDTO content);

			/**
			* 系统赠送的免单券
			* @param uid
			* @param beiZhu
			* @param dto
			*/
			public void systemGiveRewardCoupon(Long uid, String beiZhu, MsgOtherSystemGiveDTO dto);

			}