From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 1891 +++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 1,442 insertions(+), 449 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
index 71328cf..0eaada1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -1,7 +1,6 @@
 package com.yeshi.fanli.service.impl.user;
 
 import java.math.BigDecimal;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -11,50 +10,79 @@
 
 import javax.annotation.Resource;
 
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.task.TaskExecutor;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
 import org.yeshi.utils.DateUtil;
+import org.yeshi.utils.entity.DateInfo;
 
+import com.aliyun.openservices.ons.api.Message;
+import com.aliyun.openservices.ons.api.Producer;
+import com.aliyun.openservices.ons.api.SendResult;
+import com.aliyun.openservices.ons.api.transaction.LocalTransactionExecuter;
+import com.aliyun.openservices.ons.api.transaction.TransactionProducer;
+import com.aliyun.openservices.ons.api.transaction.TransactionStatus;
 import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper;
-import com.yeshi.fanli.entity.bus.user.DeviceLotteryRecord;
+import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;
+import com.yeshi.fanli.dto.mq.user.body.UserSystemCouponUseMQMsg;
+import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 import com.yeshi.fanli.entity.bus.user.Order;
+import com.yeshi.fanli.entity.bus.user.TokenRecord;
+import com.yeshi.fanli.entity.bus.user.TokenRecord.TokenTypeEnum;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
 import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
+import com.yeshi.fanli.entity.bus.user.UserSystemCouponActivate;
+import com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord;
 import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
 import com.yeshi.fanli.entity.common.JumpDetailV2;
 import com.yeshi.fanli.entity.money.UserMoneyDetail;
 import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
 import com.yeshi.fanli.entity.system.SystemCoupon;
 import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.exception.user.UserInfoExtraException;
 import com.yeshi.fanli.exception.user.UserSystemCouponException;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.SystemCouponService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
-import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
+import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
+import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
 import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;
 import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
 import com.yeshi.fanli.service.inter.order.CommonOrderService;
 import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
+import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
 import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
 import com.yeshi.fanli.service.inter.order.OrderService;
-import com.yeshi.fanli.service.inter.user.DeviceLotteryRecordService;
+import com.yeshi.fanli.service.inter.push.PushCouponRecordService;
+import com.yeshi.fanli.service.inter.push.PushCouponService;
+import com.yeshi.fanli.service.inter.user.TokenRecordService;
 import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponActivateService;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponGiveRecordService;
 import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
 import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.RedisManager;
+import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.TokenUtil;
+import com.yeshi.fanli.util.VersionUtil;
+import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
 import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
+import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
+import com.yeshi.fanli.util.rocketmq.MQTopicName;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
 import com.yeshi.fanli.vo.order.CommonOrderVO;
@@ -76,6 +104,9 @@
 	private UserSystemCouponMapper userSystemCouponMapper;
 
 	@Resource
+	private UserSystemCouponGiveRecordService userSystemCouponGiveRecordService;
+
+	@Resource
 	private ConfigService configService;
 
 	@Resource
@@ -84,6 +115,7 @@
 	@Resource
 	private SystemCouponService systemCouponService;
 
+	@Lazy
 	@Resource
 	private CommonOrderService commonOrderService;
 
@@ -91,6 +123,7 @@
 	private UserSystemCouponRecordService userSystemCouponRecordService;
 
 	@Resource
+	@Lazy
 	private HongBaoV2Service hongBaoV2Service;
 
 	@Resource
@@ -120,12 +153,35 @@
 	@Resource
 	private UserOtherMsgNotificationService userOtherMsgNotificationService;
 
-	@Resource
-	private DeviceLotteryRecordService deviceLotteryRecordService;
-
+	@Lazy
 	@Resource
 	private CommonOrderCountService commonOrderCountService;
+
+	@Resource
+	@Lazy
+	private PushCouponService pushCouponService;
+
+	@Resource
+	private PushCouponRecordService pushCouponRecordService;
+
+	@Resource
+	private TokenRecordService tokenRecordService;
+
+	@Resource(name = "transactionManager")
+	private DataSourceTransactionManager transactionManager;
+
+	@Resource(name = "orderTransactionProducer")
+	private TransactionProducer orderTransactionProducer;
+
+	@Resource
+	private UserSystemCouponActivateService userSystemCouponActivateService;
+
+	@Resource(name = "producer")
+	private Producer producer;
 	
+	@Resource
+	private UserInviteService userInviteService;
+
 	@Override
 	public int insertSelective(UserSystemCoupon record) {
 		return userSystemCouponMapper.insertSelective(record);
@@ -157,115 +213,209 @@
 	}
 
 	@Override
+	public int countTodatyUserCouponBySource(Long uid, String source) {
+		return userSystemCouponMapper.countTodatyUserCouponBySource(uid, source);
+	}
+
+	@Override
+	public long countCouponOld(Long uid) {
+		return userSystemCouponMapper.countCouponOld(uid);
+	}
+
+	@Override
 	public long countUserCouponList(Long uid) {
 		return userSystemCouponMapper.countUserCouponList(uid);
 	}
 
+	
+	
 	@Override
-	@Transactional
-	public void insertUserCoupon(Long uid, String couponType, String source)
-			throws UserSystemCouponException, Exception {
-
-		if (couponType == null || uid == null) {
+	@Transactional(rollbackFor=Exception.class)
+	public UserSystemCoupon freeCouponWin(Long uid, CouponTypeEnum typeEnum, String source, int num, boolean notify) throws UserSystemCouponException, Exception{
+		if (typeEnum == null || uid == null || StringUtil.isNullOrEmpty(source) || num < 1) {
 			throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
 		}
-
-		SystemCoupon coupon = systemCouponService.getCouponByType(couponType);
+		
+		SystemCoupon coupon = systemCouponService.getCouponByType(typeEnum.name());
 		if (coupon == null) {
 			throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝g‘");
 		}
-
-		int stateActivated = 1;
-		if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
-			// 绂忓埄鍒哥姸鎬�
-			long countSuccess = threeSaleSerivce.countSuccessFirstTeam(uid);
-			// 娌℃湁涓嬬骇闃熷憳 --寰呮縺娲�
-			if (countSuccess == 0) {
-				stateActivated = 0;
-			}
+		
+		// 婵�娲荤姸鎬�
+		int stateActivated = 0;
+		// 鑷喘鍏嶅崟鍒搞�佽禒閫佸厤鍗曞埜鍙洿鎺ヤ娇鐢�
+		if (coupon.getType() == CouponTypeEnum.freeCouponBuy || coupon.getType() == CouponTypeEnum.freeCouponGive) {
+			stateActivated = 1;
 		}
-
-		// 缁撴潫鏃ユ湡
-		// 浠婂ぉ鍦ㄥ唴  鍑忓幓涓�澶�
-		String endDay = DateUtil.plusDay(coupon.getExpiryDay() - 1, new Date());
-		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+		
+		// 鏈夋晥鏃堕暱
+		Integer expiryDay = null;
+		if (stateActivated == 0)
+			expiryDay = coupon.getActivateDay();
+		if (expiryDay == null || expiryDay == 0)
+			expiryDay = coupon.getExpiryDay();
+		
+		// 璁$畻缁撴潫鏃ユ湡
+		Date nowTime = new Date();
+		String endDay = DateUtil.plusDay(expiryDay - 1, nowTime);
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		if (endDay != null && endDay.trim().length() > 0) {
+			endDay += " 23:59:59";
+		}
 		Date endTime = format.parse(endDay);
-
-		UserSystemCoupon userCoupon = new UserSystemCoupon();
-		userCoupon.setUid(uid);
-		userCoupon.setSource(source);
-		userCoupon.setSystemCoupon(coupon);
-		userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
-		userCoupon.setStateActivated(stateActivated);
-		userCoupon.setStartTime(new Date());
-		userCoupon.setEndTime(endTime);
-		userCoupon.setCreateTime(new Date());
-		userCoupon.setUpdateTime(new Date());
-		// 鎻掑叆鏁版嵁搴�
-		insertSelective(userCoupon);
-
+		
+		UserSystemCoupon userSystemCoupon = null;
+	    for (int i = 0; i < num; i ++) {
+	    	UserSystemCoupon userCoupon = new UserSystemCoupon();
+			userCoupon.setUid(uid);
+			userCoupon.setSource(source);
+			userCoupon.setSystemCoupon(coupon);
+			userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+			userCoupon.setStateActivated(stateActivated);
+			userCoupon.setStartTime(nowTime);
+			userCoupon.setEndTime(endTime);
+			userCoupon.setCreateTime(nowTime);
+			userCoupon.setUpdateTime(nowTime);
+			userSystemCouponMapper.insertSelective(userCoupon);
+			// 闇�瑕佹縺娲诲埜
+			if (typeEnum == CouponTypeEnum.freeCoupon) {
+				userSystemCouponActivateService.addActivateRecord(userCoupon.getId());
+			}
+			
+			if (num == 1) {
+				userSystemCoupon = userCoupon;
+	    	}
+	    }
+		
 		executor.execute(new Runnable() {
 			@Override
-			public void run() {
-				UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
-				// 娣诲姞涓�鏉℃秷鎭�
-				if (userInfoExtra != null) {
-					if (userInfoExtra.getCouponNews() == null) {
-						userInfoExtra.setCouponNews(1);
-					} else {
-						userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1);
-					}
-
+			public void run() { 
+				if (notify) { // 娑堟伅鎺ㄩ��
 					try {
-						userInfoExtraService.saveUserInfoExtra(userInfoExtra);
-					} catch (UserInfoExtraException e) {
-						e.printStackTrace();
+						userOtherMsgNotificationService.freeCouponWinMsg(uid, typeEnum.getDesc(), source, 
+								num, "鎴愬姛鑾峰緱", nowTime, endTime);
+					} catch (Exception e) {
+						 e.printStackTrace();
 					}
 				}
-
+				
+				// 绂忓埄涓績绾㈢偣
+				UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
+				if (extra != null) {
+					UserInfoExtra updateExtra =	new UserInfoExtra();
+					updateExtra.setId(extra.getId());
+					if (extra.getCouponNews() == null) {
+						updateExtra.setCouponNews(1);
+					} else {
+						updateExtra.setCouponNews(extra.getCouponNews() + 1);
+					}
+					userInfoExtraService.updateByPrimaryKeySelective(updateExtra);
+				}
 			}
 		});
-
-		// 娑堟伅鎺ㄩ��
-		try {
-			if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
-				userOtherMsgNotificationService.welfareCouponGet(userCoupon);
-			} else if (coupon.getType() == CouponTypeEnum.freeCoupon) {
-				userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);
-			} else if (coupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
-				userOtherMsgNotificationService.rewardCouponGet(userCoupon, coupon.getPercent().intValue());
-			}
-
-		} catch (Exception e) {
-			try {
-				LogHelper.errorDetailInfo(e);
-			} catch (Exception e1) {
-				e1.printStackTrace();
-			}
-		}
+		
+	   return userSystemCoupon;
 	}
+	
+	
 
-	@Transactional
 	@Override
-	public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid)
+	@Transactional(rollbackFor=Exception.class)
+	public UserSystemCoupon rewardCouponWin(Long uid, String source, int num, boolean notify, 
+			BigDecimal percent) throws UserSystemCouponException, Exception{
+		if (uid == null || percent == null|| StringUtil.isNullOrEmpty(source) || num < 1) {
+			throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
+		}
+		
+		String name = CouponTypeEnum.rebatePercentCoupon.name();
+		SystemCoupon coupon = systemCouponService.getCouponByTypeAndPercent(name, percent);
+		if (coupon == null) {
+			throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝g‘");
+		}
+		
+		// 璁$畻缁撴潫鏃ユ湡
+		Date nowTime = new Date();
+		Integer expiryDay = coupon.getExpiryDay();
+		String endDay = DateUtil.plusDay(expiryDay - 1, nowTime);
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		if (endDay != null && endDay.trim().length() > 0) {
+			endDay += " 23:59:59";
+		}
+		Date endTime = format.parse(endDay);
+		
+		UserSystemCoupon userSystemCoupon = null;
+	    for (int i = 0; i < num; i ++) {
+	    	UserSystemCoupon userCoupon = new UserSystemCoupon();
+			userCoupon.setUid(uid);
+			userCoupon.setSource(source);
+			userCoupon.setSystemCoupon(coupon);
+			userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+			userCoupon.setStateActivated(1);
+			userCoupon.setStartTime(nowTime);
+			userCoupon.setEndTime(endTime);
+			userCoupon.setCreateTime(nowTime);
+			userCoupon.setUpdateTime(nowTime);
+			userSystemCouponMapper.insertSelective(userCoupon);
+			if (num == 1) {
+				userSystemCoupon = userCoupon;
+	    	}
+	    }
+		
+		executor.execute(new Runnable() {
+			@Override
+			public void run() { 
+				if (notify) { // 娑堟伅鎺ㄩ��
+					try {
+						userOtherMsgNotificationService.rewardCouponWinMsg(uid, source, num, "鎴愬姛鑾峰緱", nowTime, endTime);
+					} catch (Exception e) {
+						 e.printStackTrace();
+					}
+				}
+				
+				// 绂忓埄涓績绾㈢偣
+				UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
+				if (extra != null) {
+					UserInfoExtra updateExtra =	new UserInfoExtra();
+					updateExtra.setId(extra.getId());
+					if (extra.getCouponNews() == null) {
+						updateExtra.setCouponNews(1);
+					} else {
+						updateExtra.setCouponNews(extra.getCouponNews() + 1);
+					}
+					userInfoExtraService.updateByPrimaryKeySelective(updateExtra);
+				}
+			}
+		});
+		
+	   return userSystemCoupon;
+	}
+	
+	
+	
+	 
+
+	@Transactional(rollbackFor=Exception.class)
+	@Override
+	public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid, boolean changeJump)
 			throws UserSystemCouponException, Exception {
 
 		if (uid == null) {
 			return null;
 		}
 
-		// 鏇存柊杩囨湡鍒�
-		updateCounponInvalid(uid);
+		// 杩囨湡鍒�
+		updateInvalidSate(uid);
+
 		// 閫�鍥炲埜
 		sendBackTimeOutCoupon(uid);
 
-		List<UserSystemCouponVO> listVO = userSystemCouponMapper.getUserCouponVOList(start, count, uid);
+		List<UserSystemCouponVO> listVO = userSystemCouponMapper.getCouponListOld(start, count, uid);
 		if (listVO == null || listVO.size() == 0) {
 			return listVO;
 		}
 
 		// 鏁版嵁缁勭粐
-		listDataFactory(listVO, uid);
+		listDataFactory(listVO, uid, changeJump);
 
 		return listVO;
 	}
@@ -275,7 +425,13 @@
 	 * 
 	 * @param listVO
 	 */
-	public void listDataFactory(List<UserSystemCouponVO> listVO, Long uid) throws Exception {
+	public void listDataFactory(List<UserSystemCouponVO> listVO, Long uid, boolean changeJump) throws Exception {
+
+		String inviteCode = null;
+		UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+		if (userInfoExtra != null) {
+			inviteCode = userInfoExtra.getInviteCode();
+		}
 
 		for (UserSystemCouponVO userCouponVO : listVO) {
 
@@ -312,7 +468,6 @@
 				// 鏄剧ず瑙勫垯
 				userCouponVO.setCouponRule(systemCoupon.getRemark());
 				userCouponVO.setCouponEffect("寰呮縺娲�");
-
 				// 鐘舵�佹湭婵�娲� -涓旀湭琚娇鐢�
 				if (UserSystemCoupon.STATE_CAN_USE == state) {
 					userCouponVO.setState(0);
@@ -320,21 +475,18 @@
 
 				jumpBtn = new HashMap<String, Object>();
 
-				// 閭�璇烽槦鍛樼晫闈�
-				/*
-				 * Map<String, Object> jumpLink = new HashMap<String, Object>();
-				 * UserInfoExtra userInfoExtra =
-				 * userInfoExtraService.getUserInfoExtra(uid); if (userInfoExtra
-				 * != null && userInfoExtra.getInviteCode() != null &&
-				 * userInfoExtra.getInviteCode().trim().length() > 0) { //
-				 * 閭�璇锋縺娲绘垚鍔熺晫闈� jumpLink.put("url",
-				 * configService.get("invite_activation_success_url") +
-				 * "?alert=true"); } else { // 婵�娲婚個璇风爜鐣岄潰 jumpLink.put("url",
-				 * configService.get("invite_activation_url")); }
-				 * jumpBtn.put("params", jumpLink);
-				 */
-
-				jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));
+				// 绂忓埄鍒搁渶瑕佹縺娲荤晫闈�
+				if (!changeJump) {
+					jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));
+				} else {
+					if (inviteCode != null && inviteCode.trim().length() > 0) {
+						// 閭�璇峰ソ鍙嬬晫闈�
+						jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_friends"));
+					} else {
+						// 閭�璇锋縺娲荤晫闈�
+						jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_activate"));
+					}
+				}
 
 			} else if (stateActivated == 1) {
 				// 鏄剧ず瑙勫垯
@@ -347,7 +499,7 @@
 						// 鍏嶅崟鍒搞�� 绂忓埄鍏嶅崟鍒�
 
 						// 鍏嶅崟鍟嗗搧鍒楄〃
-						jumpLink.put("url", configService.get("free_goods_list"));
+						jumpLink.put("url", configService.get(ConfigKeyEnum.freeGoodsList.getKey()));
 
 						jumpBtn = new HashMap<String, Object>();
 						jumpBtn.put("params", jumpLink);
@@ -365,7 +517,7 @@
 
 				} else if (UserSystemCoupon.STATE_IN_USE == state) {
 					// 浣跨敤涓�
-					userCouponVO.setInUseExplain(configService.get("free_coupon_using-help"));
+					userCouponVO.setInUseExplain(configService.get(ConfigKeyEnum.freeCouponUsingHelp.getKey()));
 				}
 			}
 
@@ -433,11 +585,16 @@
 			}
 
 			String source = userCouponVO.getSource();
-			userCouponVO.setSource("鏉ユ簮锛�" + source);
+			if (source != null && "濂栧姳鍒稿ぉ澶╂娊".equals(source)) {
+				source = "澶╁ぉ鎶�";
+			}
 
+			userCouponVO.setSource("鏉ユ簮锛�" + source);
 			userCouponVO.setCouponName(systemCoupon.getName());
 			userCouponVO.setCouponEffect(systemCoupon.getEffect());
 			userCouponVO.setCouponRule(systemCoupon.getRule());
+			userCouponVO.setCouponRuleLink(systemCoupon.getRuleLink());
+			userCouponVO.setCouponPicture(systemCoupon.getPicture());
 			userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());
 
 			int differentDays = 0;
@@ -454,7 +611,6 @@
 					differentDays = 0;
 				}
 			}
-
 			userCouponVO.setCouponTerm(couponTerm);
 
 			// 鍓╀綑澶╂暟
@@ -467,12 +623,9 @@
 				userCouponVO.setState(0);
 				userCouponVO.setCouponEffect("寰呮縺娲�");
 				userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
-
 				remainDaysFontColor = "#CCCCCC";
-
 			} else {
 				userCouponVO.setCouponPicture(systemCoupon.getPicture());
-
 				remainDaysFontColor = "#F14242";
 			}
 
@@ -507,19 +660,19 @@
 		return hasCoupon;
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {
+
 		if (uid == null) {
 			throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
 		}
 
-		// 鏇存柊杩囨湡鍒�
-		updateCounponInvalid(uid);
+		// 杩囨湡鍒�
+		updateInvalidSate(uid);
+
 		// 閫�鍥炲埜
 		sendBackTimeOutCoupon(uid);
-		// 娲诲姩棰嗗彇鍒�
-		receivedCoupon(uid);
 
 		// 璁㈠崟鐩稿叧鐨勫埜
 		List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();
@@ -530,7 +683,7 @@
 		return getEnableListByCouponId(uid, 1, couponList);
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId)
 			throws UserSystemCouponException, Exception {
@@ -543,13 +696,11 @@
 			throw new UserSystemCouponException(1, "鍟嗗搧ID涓虹┖");
 		}
 
-		// 鏇存柊杩囨湡鍒�
-		updateCounponInvalid(uid);
+		// 杩囨湡鍒�
+		updateInvalidSate(uid);
+
 		// 閫�鍥炲埜
 		sendBackTimeOutCoupon(uid);
-		
-		// 娲诲姩棰嗗彇鍒�
-		receivedCoupon(uid);
 
 		// 鍟嗗搧鐩稿叧鐨勫埜
 		List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
@@ -563,7 +714,6 @@
 		TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
 		if (taoBaoGoodsBrief != null) {
 			BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
-
 			// 鍒稿悗浠� 澶т簬10鍏� 涓嶈兘鍏嶅崟
 			if (quanPrice.compareTo(new BigDecimal(10)) > 0) {
 				if (list != null && list.size() > 0) {
@@ -577,7 +727,6 @@
 							map.put("fontColor", "#CCCCCC");
 						}
 						userCouponVO.setRemainDays(map);
-
 					}
 				}
 			}
@@ -586,9 +735,64 @@
 		return list;
 	}
 
-	@Transactional
 	@Override
-	public void useGoodsCoupon(Long uid, Long id, Long goodId) throws UserSystemCouponException, Exception {
+	public long countUsableFreeCouponForBuy(Long uid) {
+		if (uid == null)
+			return 0;
+
+		List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
+		if (couponList == null || couponList.size() == 0)
+			return 0;
+
+		List<Long> listCouponId = new ArrayList<Long>();
+		for (SystemCoupon systemCoupon : couponList) {
+			listCouponId.add(systemCoupon.getId());
+		}
+
+		return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
+	}
+	
+	
+	@Override
+	public long countGiveFreeCoupon(Long uid) {
+		if (uid == null)
+			return 0;
+
+		List<SystemCoupon> couponList = systemCouponService.getGiveFreeCouponList();
+		if (couponList == null || couponList.size() == 0)
+			return 0;
+
+		List<Long> listCouponId = new ArrayList<Long>();
+		for (SystemCoupon systemCoupon : couponList) {
+			listCouponId.add(systemCoupon.getId());
+		}
+
+		return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
+	}
+
+	
+
+	@Override
+	public long countUsableRewardCoupon(Long uid) {
+		if (uid == null)
+			return 0;
+
+		List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();
+		if (couponList == null || couponList.size() == 0)
+			return 0;
+
+		List<Long> listCouponId = new ArrayList<Long>();
+		for (SystemCoupon systemCoupon : couponList) {
+			listCouponId.add(systemCoupon.getId());
+		}
+
+		return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
+	}
+
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public void useGoodsCoupon(Long uid, Long id, Long goodId, Integer sourceType)
+			throws UserSystemCouponException, Exception {
 		if (uid == null) {
 			throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
 		}
@@ -601,7 +805,7 @@
 		if (userSystemCoupon == null) {
 			throw new UserSystemCouponException(1, "鍒告暟鎹笉姝g‘");
 		}
-		
+
 		if (userSystemCoupon.getUid().longValue() != uid) {
 			throw new UserSystemCouponException(1, "涓嶅睘浜庤鐢ㄦ埛鐨勫埜");
 		}
@@ -625,7 +829,8 @@
 		}
 
 		if (baseCoupon.getType() != CouponTypeEnum.freeCoupon
-				&& baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+				&& baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon
+				&& baseCoupon.getType() != CouponTypeEnum.freeCouponBuy) {
 			throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤");
 		}
 
@@ -639,7 +844,7 @@
 		// 鎻掑叆浣跨敤鍒歌褰�
 		UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
 		couponRecord.setGoodId(goodId);
-		couponRecord.setGoodSource(Constant.SOURCE_TYPE_TAOBAO); // 榛樿娣樺疂
+		couponRecord.setGoodSource(sourceType); // 榛樿娣樺疂
 		couponRecord.setState(UserSystemCouponRecord.STATE_WAIT); // 姝e湪鍖归厤
 		couponRecord.setUserSystemCoupon(userSystemCoupon);
 		couponRecord.setCouponType(baseCoupon.getType().name());
@@ -661,51 +866,99 @@
 
 	}
 
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	@Override
-	public void useOrderCoupon(Long uid, Long id, String orderNo) throws UserSystemCouponException, Exception {
-
-		if (id == null) {
+	public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType, AcceptData acceptData)
+			throws UserSystemCouponException, Exception {
+		if (id == null)
 			throw new UserSystemCouponException(1, "鍒竔d涓嶅瓨鍦�");
-		}
+
+		if (sourceType == null)
+			sourceType = Constant.SOURCE_TYPE_TAOBAO;
 
 		// 鐢ㄦ埛鍒�
 		UserSystemCoupon userSystemCoupon = selectByPrimaryKey(id);
-		if (userSystemCoupon == null) {
+		if (userSystemCoupon == null)
 			throw new UserSystemCouponException(1, "鍒镐俊鎭笉瀛樺湪");
-		}
 
-		if (userSystemCoupon.getUid().longValue() != uid) {
+		if (userSystemCoupon.getUid().longValue() != uid)
 			throw new UserSystemCouponException(1, "涓嶅睘浜庤鐢ㄦ埛鐨勫埜");
-		}
 
 		Integer state = userSystemCoupon.getState();
 		Integer stateActivated = userSystemCoupon.getStateActivated();
-		if (UserSystemCoupon.STATE_CAN_USE != state || 1 != stateActivated) {
+		if (UserSystemCoupon.STATE_CAN_USE != state || 1 != stateActivated)
 			throw new UserSystemCouponException(1, "璇ュ埜涓嶈兘琚娇鐢�");
-		}
 
 		// 绯荤粺鍒镐俊鎭�
 		SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
 		if (systemCoupon != null && systemCoupon.getId() != null) {
 			systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
-			if (systemCoupon == null) {
+			if (systemCoupon == null)
 				throw new UserSystemCouponException(1, "鍒稿凡涓嶅瓨鍦�");
+		}
+
+		if (systemCoupon.getType() != CouponTypeEnum.rebatePercentCoupon)
+			throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤");
+
+		if (orderNo == null || orderNo.trim().length() == 0)
+			throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪");
+
+		// 妫�鏌ヨ鍗曞彿鏄惁缁存潈
+		List<CommonOrder> commonOrderList = commonOrderService.listBySourceTypeAndOrderId(sourceType, orderNo);
+		boolean weiquan = false;
+		if (commonOrderList != null) {
+			for (CommonOrder commonOrder : commonOrderList) {
+				if (commonOrder.getState() == CommonOrder.STATE_WQ) {
+					weiquan = true;
+					break;
+				}
 			}
 		}
-
-		if (systemCoupon.getType() != CouponTypeEnum.rebatePercentCoupon) {
-			throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤");
+		
+		if (weiquan) {
+			throw new UserSystemCouponException(1, "浜诧紝寰堥仐鎲撅紝鍞悗缁存潈璁㈠崟涓嶈兘浣跨敤杩斿埄濂栧姳鍒竳");
 		}
 
-		if (orderNo == null || orderNo.trim().length() == 0) {
-			throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪");
-		}
-
+		
 		// 璁㈠崟
-		CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS);
-		if (orderVO == null) {
-			throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
+		List<CommonOrderVO> listVo = commonOrderService.listGroupOrderNoByUid(0, 1, uid, 2, 1,1, orderNo, null, 
+				null, null, sourceType);
+		if (listVo == null || listVo.size() == 0) 
+			throw new UserSystemCouponException(1, "浜诧紝寰堥仐鎲撅紝璇ヨ鍗曞凡涓嶈兘浣跨敤杩斿埄濂栧姳鍒竳");
+		
+		CommonOrderVO orderVO = listVo.get(0);
+		
+		// 2.1鏂扮増
+		Date thirdCreateTime = orderVO.getThirdCreateTime();
+		Date accountTime = orderVO.getAccountTime();
+		if (thirdCreateTime == null || accountTime == null) 
+			throw new UserSystemCouponException(1, "璇ヨ鍗曚笉鑳戒娇鐢ㄥ鍔卞埜");
+		
+		long downOrderTime = thirdCreateTime.getTime();
+		long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
+		if (downOrderTime > limitDate) {
+			boolean valid = false;
+			Date endDay = DateUtil.plusDayDate(Constant.COUPON_REWARD_LIMIT_DAY, accountTime);
+			long currentTime = java.lang.System.currentTimeMillis();
+			if (endDay.getTime() > currentTime) {
+				DateInfo dateInfo = DateUtil.dateDiff3(currentTime, endDay.getTime());
+				if (dateInfo != null) {
+					if (dateInfo.getDay() > 0)
+						valid = true;
+
+					if (!valid && dateInfo.getHour() > 0)
+						valid = true;
+
+					if (!valid && dateInfo.getMinute() > 0)
+						valid = true;
+
+					if (!valid && dateInfo.getSecond() > 0)
+						valid = true;
+				}
+			}
+			
+			if (!valid)
+				throw new UserSystemCouponException(1, "璇ヨ鍗曚笉鑳戒娇鐢ㄥ鍔卞埜");
 		}
 
 		BigDecimal hongBao = orderVO.getHongBao();
@@ -717,9 +970,9 @@
 		// 鏉′欢: A:蹇呴』鏄繑鍒╄鍗� 銆丅:蹇呴』宸茬粡澶勪簬宸插埌璐︾姸鎬�
 		if (HongBaoV2.TYPE_ZIGOU == hongBaoType && HongBaoV2.STATE_YILINGQU == hongBaoState || hongBao != null) {
 
-			Order order = orderService.findOrderByOrderIdAndType(orderNo, Order.ORDER_TYPE_TAOBAO);
+			Order order = orderService.findOrderByOrderIdAndType(orderNo, sourceType);
 			if (order == null)
-				return;
+				throw new UserSystemCouponException(1, "璇ヨ鍗曚笉瀛樺湪");
 
 			/* 濂栭噾璁$畻 浠ュ強鐩稿叧绾㈠寘淇℃伅澶勭悊 */
 
@@ -728,6 +981,40 @@
 			// 鎻愭垚閲戦
 			BigDecimal money = MoneyBigDecimalUtil.mul(hongBao, percent);
 
+			UserSystemCouponUseMQMsg mqMsg = new UserSystemCouponUseMQMsg(userSystemCoupon.getId(), order.getOrderId(),
+					sourceType, systemCoupon.getType().name());
+			
+			if (Constant.IS_TEST) {
+				useRewardCouponCore(userSystemCoupon, money, hongBao, uid, order);
+			} else { // 浜嬪姟娑堟伅
+				Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.useSystemCoupon, mqMsg);
+				try {
+					SendResult result = orderTransactionProducer.send(msg, new LocalTransactionExecuter() {
+						@Override
+						public TransactionStatus execute(Message arg0, Object arg1) {
+							try {
+								useRewardCouponCore(userSystemCoupon, money, hongBao, uid, order);
+								return TransactionStatus.CommitTransaction;
+							} catch (Exception e) {
+								return TransactionStatus.RollbackTransaction;
+							}
+						}
+					}, null);
+					System.out.println(result);
+				} catch (Exception e) {
+					e.printStackTrace();
+					throw e;
+				}
+			}
+		}
+	}
+
+	@Transactional(rollbackFor=Exception.class)
+	public void useRewardCouponCore(UserSystemCoupon userSystemCoupon, BigDecimal money, BigDecimal hongBao, Long uid,
+			Order order) throws Exception {
+		org.springframework.transaction.TransactionStatus transactionStatus = transactionManager
+				.getTransaction(new DefaultTransactionDefinition());
+		try {
 			// 1銆佹彃鍏ョ孩鍖呮暟鎹�
 			HongBaoV2 hongBaoV2 = new HongBaoV2();
 			hongBaoV2.setMoney(money);
@@ -739,20 +1026,17 @@
 			hongBaoV2.setUserInfo(new UserInfo(uid));
 			hongBaoV2.setPreGetTime(new Date());
 			hongBaoV2.setGetTime(new Date());
+
 			hongBaoV2Service.insertSelective(hongBaoV2);
 
 			// 2.鎻掑叆鍏宠仈
 			orderHongBaoMapService.addOrderHongBaoMap(hongBaoV2, order);
 
 			// 3.鎻掑叆璧勯噾鏄庣粏,鐢ㄦ埛浣欓
-			UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(orderNo, money,
-					new UserInfo(uid));
+			UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(order.getOrderId(),
+					order.getOrderType(), money, new UserInfo(uid));
 			userMoneyDetailService.addUserMoneyDetail(userMoneyDetail);
 			userInfoService.addMoney(new UserInfo(uid), money);
-
-			// 鎻掑叆璧勯噾閫氱煡
-			userMoneyMsgNotificationService.orderReward(uid, orderNo, money,
-					userInfoService.selectByPKey(uid).getMyHongBao());
 
 			/* 鐢ㄦ埛鍒镐俊鎭姸鎬佸強璁板綍澶勭悊 */
 
@@ -763,28 +1047,40 @@
 			userSystemCoupon.setUpdateTime(date);
 			userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
 
+			SystemCoupon coupon = systemCouponService.selectByPrimaryKey(userSystemCoupon.getSystemCoupon().getId());
+
 			// 鎻掑叆浣跨敤鍒歌褰�
 			UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
 			couponRecord.setState(UserSystemCouponRecord.STATE_SUCCESS);
-			couponRecord.setOrderNo(orderNo);
+			couponRecord.setGoodSource(order.getOrderType());
+			couponRecord.setOrderNo(order.getOrderId());
 			couponRecord.setUserSystemCoupon(userSystemCoupon);
-			couponRecord.setCouponType(systemCoupon.getType().name());
+			couponRecord.setCouponType(coupon.getType().name());
 			couponRecord.setCreateTime(date);
 			couponRecord.setUpdateTime(date);
 			userSystemCouponRecordService.insertSelective(couponRecord);
 
+			// 鎻掑叆璧勯噾閫氱煡
+			userMoneyMsgNotificationService.orderReward(uid, order.getOrderId(), order.getOrderType(), money,
+					userInfoService.selectByPKey(uid).getMyHongBao());
 			// 娑堟伅鎺ㄩ��
 			try {
-				userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon, hongBao, money, orderNo);
+				userOtherMsgNotificationService.rewardCouponEndMsg(uid, userSystemCoupon.getSource(), 1, "浣跨敤鎴愬姛");
 			} catch (Exception e) {
 				LogHelper.errorDetailInfo(e);
 			}
+			transactionManager.commit(transactionStatus);
+		} catch (Exception e) {
+			e.printStackTrace();
+			transactionManager.rollback(transactionStatus);
+			throw new Exception();
 		}
 
 	}
 
 	@Override
-	public UserSystemCouponRecordVO getRewardCouponRecord(String orderNo) throws UserSystemCouponException, Exception {
+	public UserSystemCouponRecordVO getRewardCouponRecord(String orderNo, Integer sourceType)
+			throws UserSystemCouponException, Exception {
 
 		if (orderNo == null || orderNo.trim().length() == 0) {
 			throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪");
@@ -820,7 +1116,7 @@
 		Long uid = userSystemCoupon.getUid();
 
 		CommonOrderVO commonOrderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo,
-				CommonOrder.STATE_JS);
+				CommonOrder.STATE_JS, sourceType);
 
 		if (commonOrderVO == null) {
 			throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
@@ -843,7 +1139,7 @@
 		userRecordVO.setCouponEffect("杩斿埄楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN) + "宸茶繑" + percent + "%");
 
 		// 璧勯噾鏄庣粏
-		JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("capitalDetails");
+		JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("moneyDetails");
 		Map<String, Object> jumpWelfare = new HashMap<String, Object>();
 		jumpWelfare.put("jumpDetail", welfareCore);
 		Map<String, Object> jumpparms = new HashMap<String, Object>();
@@ -851,9 +1147,9 @@
 		userRecordVO.setJumpWelfare(jumpWelfare);
 
 		// 璺宠浆濂栧姳鍒歌鍒�
-		userRecordVO.setRuleLink(configService.get("reward_coupon_help"));
+		userRecordVO.setRuleLink(configService.get(ConfigKeyEnum.rewardCouponHelp.getKey()));
 
-		String rewardCouponRemark = configService.get("reward_coupon_remark");
+		String rewardCouponRemark = configService.get(ConfigKeyEnum.rewardCouponRemark.getKey());
 		if (rewardCouponRemark != null && rewardCouponRemark.trim().length() > 0) {
 			userRecordVO.setRemark(JSONObject.fromObject(rewardCouponRemark));
 		}
@@ -862,7 +1158,8 @@
 	}
 
 	@Override
-	public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo) throws UserSystemCouponException, Exception {
+	public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo, Integer sourceType)
+			throws UserSystemCouponException, Exception {
 
 		if (orderNo == null || orderNo.trim().length() == 0) {
 			throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪");
@@ -890,7 +1187,8 @@
 		}
 
 		// 璁㈠崟
-		CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo, null);
+		CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo, null,
+				sourceType);
 		if (orderVO == null) {
 			throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
 		}
@@ -910,7 +1208,7 @@
 		String progressMsg = "";
 		String progressColor = "";
 		// 璺宠浆濂栧姳鍒歌鍒�
-		userRecordVO.setRuleLink(configService.get("free_coupon_help"));
+		userRecordVO.setRuleLink(configService.get(ConfigKeyEnum.freeCouponHelp.getKey()));
 
 		// 杩涘害锛� 1 鐏拌壊 2 绾㈣壊 3 缁胯壊
 		String progressState1 = "3";
@@ -948,7 +1246,7 @@
 
 			jumpDetail = jumpDetailV2Service.getByTypeCache("welfareCore");
 
-			rewardCouponRemark = configService.get("free_coupon_back_remark");
+			rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponBackRemark.getKey());
 
 		} else if (UserSystemCouponRecord.STATE_FAIL_DRAWBACK == stateRecord) {
 			// 閫�娆�
@@ -967,7 +1265,7 @@
 
 			jumpDetail = jumpDetailV2Service.getByTypeCache("welfareCore");
 
-			rewardCouponRemark = configService.get("free_coupon_back_remark");
+			rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponBackRemark.getKey());
 
 		} else if (UserSystemCouponRecord.STATE_FREE_ON == stateRecord) {
 			// 鍏嶅崟涓�
@@ -981,7 +1279,7 @@
 				progressMsg = "鍏嶅崟鍙戣捣锛岀瓑寰呮敹璐�";
 			}
 
-			rewardCouponRemark = configService.get("free_coupon_remark");
+			rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponRemark.getKey());
 
 		} else if (UserSystemCouponRecord.STATE_SUCCESS == stateRecord) {
 			// 鍏嶅崟鎴愬姛
@@ -1003,7 +1301,7 @@
 
 			jumpDetail = jumpDetailV2Service.getByTypeCache("capitalDetails");
 
-			rewardCouponRemark = configService.get("free_coupon_remark");
+			rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponRemark.getKey());
 		}
 		userRecordVO.setProgressState(progressState);
 		userRecordVO.setPayMoney(payMoney);
@@ -1062,62 +1360,8 @@
 		return userRecordVO;
 	}
 
-	@Transactional
-	@Override
-	public void activatedWelfareFreeCoupon(Long uid, String fromNickName) {
 
-		LogHelper.test("鍒告縺娲�:" + uid);
-		if (uid == null) {
-			return;
-		}
-		// 绂忓埄鍏嶅崟鍒�
-		String welfareFree = CouponTypeEnum.welfareFreeCoupon.name();
-
-		SystemCoupon systemCoupon = systemCouponService.getCouponByType(welfareFree);
-		if (systemCoupon == null) {
-			return;
-		}
-
-		// 楠岃瘉鏄惁澶辨晥
-		updateCounponInvalid(uid);
-
-		// 寰呮椿绂忓埄鍏嶅崟鍒�
-		List<UserSystemCoupon> list = userSystemCouponMapper.getCouponByTypeAndNotActivated(uid, systemCoupon.getId());
-		if (list == null || list.size() == 0) {
-			return;
-		}
-
-		for (UserSystemCoupon userSystemCoupon : list) {
-			// 婵�娲�
-			UserSystemCoupon update = new UserSystemCoupon();
-			update.setId(userSystemCoupon.getId());
-			update.setStateActivated(1);
-			update.setUpdateTime(new Date());
-			userSystemCouponMapper.updateByPrimaryKeySelective(update);
-
-			Integer state = userSystemCoupon.getState();
-			if (UserSystemCoupon.STATE_OVERDUE == state) {
-				continue; // 宸插け鏁堜笉鍋氭秷鎭帹閫�
-			}
-
-			// 娑堟伅鎺ㄩ��
-			try {
-				UserInfo userInfo = new UserInfo();
-				userInfo.setId(uid);
-				userInfo.setNickName(fromNickName);
-
-				userOtherMsgNotificationService.welfareCouponActive(userSystemCoupon, userInfo);
-			} catch (Exception e) {
-				try {
-					LogHelper.errorDetailInfo(e);
-				} catch (Exception e1) {
-					e1.printStackTrace();
-				}
-			}
-		}
-	}
-
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public void updateStateByDrawback(String orderNo) throws Exception {
 
@@ -1139,7 +1383,7 @@
 		sendBackCoupon(record.getUserSystemCoupon(), record);
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public void updateStateByArrivalAccount(String orderNo) throws Exception {
 
@@ -1156,106 +1400,15 @@
 		record.setUpdateTime(new Date());
 		record.setState(UserSystemCouponRecord.STATE_SUCCESS);
 		userSystemCouponRecordService.updateByPrimaryKeySelective(record);
-
-		// 娑堟伅鎺ㄩ��
-		if (CouponTypeEnum.welfareFreeCoupon.name().equals(record.getCouponType())) {
-			userOtherMsgNotificationService.welfareCouponUsed(record.getUserSystemCoupon(), orderNo);
-		} else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) {
-			userOtherMsgNotificationService.freeSheetCouponUsed(record.getUserSystemCoupon(), orderNo);
-		}
 	}
-
-	@Transactional
+	
+	
 	@Override
-	public void updateCounponInvalid(Long uid) {
-		List<UserSystemCoupon> list = userSystemCouponMapper.getCounponNowInvalid(uid);
-		if (list == null || list.size() == 0) {
-			return;
-		}
-
-		for (UserSystemCoupon userSystemCoupon : list) {
-			// 鏇存柊鍒稿凡杩囨湡
-			userSystemCoupon.setState(UserSystemCoupon.STATE_OVERDUE);
-			userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
-
-			SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
-			if (systemCoupon == null) {
-				continue;
-			}
-
-			SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
-			if (baseCoupon == null || baseCoupon.getId() == null) {
-				continue;
-			}
-
-			// 娑堟伅鎺ㄩ��
-			try {
-				if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
-					userOtherMsgNotificationService.welfareCouponAlreadyOutOfDate(userSystemCoupon);
-				} else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
-					userOtherMsgNotificationService.freeSheetCouponAlreadyOutOfDate(userSystemCoupon);
-				} else if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
-					userOtherMsgNotificationService.rewardCouponAlreadyOutOfDate(userSystemCoupon);
-				}
-
-			} catch (Exception e) {
-				try {
-					LogHelper.errorDetailInfo(e);
-				} catch (Exception e1) {
-					e1.printStackTrace();
-				}
-			}
-		}
+	public List<UserSystemCoupon> getCounponNowInvalid(int count) {
+		return userSystemCouponMapper.getCounponNowInvalid(count);
 	}
 
-	@Transactional
-	@Override
-	public void sendBackTimeOutCoupon(Long uid) {
-		// 瓒呰繃120绉� 鏈鍖归厤鐨勫埜
-		List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120L);
-		if (list == null || list.size() == 0) {
-			return;
-		}
-
-		for (UserSystemCouponRecord couponRecord : list) {
-			// 鏇存柊鐘舵�侊細鍖归厤瓒呮椂
-			couponRecord.setState(UserSystemCouponRecord.STATE_WAIT_TIME_OUT);
-			couponRecord.setUpdateTime(new Date());
-			userSystemCouponRecordService.updateByPrimaryKeySelective(couponRecord);
-
-			UserSystemCoupon userSystemCoupon = couponRecord.getUserSystemCoupon();
-
-			int expiryDay = 15;
-
-			SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
-			SystemCoupon coupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
-			if (coupon != null) {
-				expiryDay = coupon.getExpiryDay();
-			}
-
-			// 缁撴潫鏃ユ湡
-			Date endTime = null;
-			try {
-				// 浠婂ぉ鍦ㄥ唴  鍑忓幓涓�澶�
-				String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
-				SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-				endTime = format.parse(endDay);
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-			// 鐘舵�佸垵濮嬪寲
-			userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
-			userSystemCoupon.setUseTime(null);
-
-			// 鏈夋晥鏈熸椂闂撮噸鏂板畾涔�
-			userSystemCoupon.setStartTime(new Date());
-			userSystemCoupon.setEndTime(endTime);
-			userSystemCoupon.setUpdateTime(new Date());
-			userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
-		}
-	}
-
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId)
 			throws Exception {
@@ -1319,16 +1472,566 @@
 				if (couponType == null || couponType.trim().length() == 0) {
 					throw new Exception("鍒哥被鍨嬫湭琚褰�");
 				}
-
-				if (CouponTypeEnum.welfareFreeCoupon.name().equals(couponType)) {
-					userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon, orderNo, payment);
-				} else if (CouponTypeEnum.freeCoupon.name().equals(couponType)) {
-					userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon, orderNo, payment);
-				}
 			}
 		}
 
 		return isfree;
+	}
+
+
+
+	/**
+	 * 闅忔満鍒告瘮渚�
+	 * 
+	 * @return
+	 */
+	private int randomCounponPercent() {
+		int result = 1;
+		List<RandomProportion> list = new ArrayList<RandomProportion>();
+		list.add(new RandomProportion(1, 22));
+		list.add(new RandomProportion(2, 22));
+		list.add(new RandomProportion(3, 22));
+		list.add(new RandomProportion(4, 22));
+		list.add(new RandomProportion(5, 20));
+		list.add(new RandomProportion(6, 18));
+		list.add(new RandomProportion(7, 16));
+		list.add(new RandomProportion(8, 14));
+		list.add(new RandomProportion(9, 12));
+		list.add(new RandomProportion(10, 10));
+		list.add(new RandomProportion(11, 8));
+		list.add(new RandomProportion(12, 6));
+		list.add(new RandomProportion(13, 4));
+		list.add(new RandomProportion(14, 2));
+		list.add(new RandomProportion(15, 1));
+
+		int minRange = 0;
+		int maxRange = 0;
+		int randomNum = (int) (1 + Math.round(Math.random() * (199)));
+		for (int i = 0; i < list.size(); i++) {
+			RandomProportion proportion = list.get(i);
+			int probability = proportion.probability;
+			maxRange = maxRange + probability;
+			minRange = maxRange - probability;
+			if (randomNum > minRange && randomNum <= maxRange) {
+				result = proportion.num;
+				break;
+			}
+		}
+		return result;
+	}
+
+	class RandomProportion {
+		public int num;// 鍒稿��
+		public int probability; // 姒傜巼
+
+		RandomProportion() {
+		}
+
+		RandomProportion(int num, int probability) {
+			this.num = num;
+			this.probability = probability;
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor=Exception.class)
+	public void exchangeCoupon(Long uid, String couponType, String source, BigDecimal percent)
+			throws UserSystemCouponException, Exception {
+		if (couponType == null || uid == null) {
+			throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
+		}
+
+		SystemCoupon coupon = null;
+		if (couponType.equals(CouponTypeEnum.rebatePercentCoupon.name())) {
+			coupon = systemCouponService.getCouponByTypeAndPercent(couponType, percent);
+		} else {
+			coupon = systemCouponService.getCouponByType(couponType);
+		}
+
+		if (coupon == null) {
+			throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝g‘");
+		}
+
+		int stateActivated = 1;
+		if (couponType == CouponTypeEnum.freeCoupon.name()) {
+			stateActivated = 0; //
+		} else if (couponType == CouponTypeEnum.welfareFreeCoupon.name()
+				&& threeSaleSerivce.countSuccessFirstTeam(uid) <= 0) {
+			stateActivated = 0; // 鏃犱笅绾ч槦鍛� --寰呮縺娲�
+		}
+
+		Integer expiryDay = null;
+		if (stateActivated == 0)
+			expiryDay = coupon.getActivateDay();
+
+		if (expiryDay == null || expiryDay == 0)
+			expiryDay = coupon.getExpiryDay();
+
+		// 璁$畻缁撴潫鏃ユ湡锛氫粖澶╁湪鍐� 鍑忓幓涓�澶�
+		String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		if (endDay != null && endDay.trim().length() > 0) {
+			endDay += " 23:59:59";
+		}
+		Date endTime = format.parse(endDay);
+
+		UserSystemCoupon userCoupon = new UserSystemCoupon();
+		userCoupon.setUid(uid);
+		userCoupon.setSource(source);
+		userCoupon.setSystemCoupon(coupon);
+		userCoupon.setStateActivated(stateActivated);
+		userCoupon.setStartTime(new Date());
+		userCoupon.setEndTime(endTime);
+		userCoupon.setGive(false);
+		userCoupon.setCreateTime(new Date());
+		userCoupon.setUpdateTime(new Date());
+		userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+
+		insertSelective(userCoupon);
+	}
+
+	@Transactional(rollbackFor=Exception.class)
+	@Override
+	public List<UserSystemCouponVO> getCouponList(AcceptData acceptData, long start, int count, Long uid)
+			throws UserSystemCouponException, Exception {
+
+		// 杩囨湡鍒�
+		updateInvalidSate(uid);
+
+		// 閫�鍥炲埜
+		sendBackTimeOutCoupon(uid);
+
+		// 璧犻�佺殑閫�鍥�
+		sendBackGiveUser(uid);
+
+		List<UserSystemCouponVO> listVO = userSystemCouponMapper.getUserCouponVOList(start, count, uid);
+		if (listVO == null || listVO.size() == 0) {
+			return listVO;
+		}
+
+		// 鏄惁婵�娲婚個璇风爜
+		String inviteCode = null;
+		UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+		if (userInfoExtra != null) {
+			inviteCode = userInfoExtra.getInviteCode();
+		}
+
+		for (UserSystemCouponVO userCouponVO : listVO) {
+			SystemCoupon systemCoupon = userCouponVO.getSystemCoupon();
+			if (systemCoupon != null && systemCoupon.getId() != null) {
+				systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+			}
+
+			if (systemCoupon == null) {
+				continue; // 鍒镐俊鎭笉瀹屾暣
+			}
+
+			String source = userCouponVO.getSource();
+			if (source != null && "濂栧姳鍒稿ぉ澶╂娊".equals(source)) {
+				source = "澶╁ぉ鎶�";
+			}
+
+			userCouponVO.setSource("鏉ユ簮锛�" + source);
+			userCouponVO.setCouponName(systemCoupon.getName());
+			userCouponVO.setCouponEffect(systemCoupon.getEffect());
+			userCouponVO.setCouponRule(systemCoupon.getRule());
+			userCouponVO.setCouponRuleLink(systemCoupon.getRuleLink());
+
+			String couponTerm = "鏈夋晥鏈燂細";
+			Date startTime = userCouponVO.getStartTime();
+			Date endTime = userCouponVO.getEndTime();
+			if (endTime != null && startTime != null) {
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+				couponTerm = couponTerm + sdf.format(startTime) + "-" + sdf.format(endTime);
+			}
+			userCouponVO.setCouponTerm(couponTerm);
+
+			Integer state = userCouponVO.getState();
+			if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) {
+				userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
+			} else {
+				userCouponVO.setCouponPicture(systemCoupon.getPicture());
+			}
+
+			if (UserSystemCoupon.STATE_CAN_USE == state || UserSystemCoupon.STATE_IN_USE == state) {
+				int differentDays = 0;
+				if (endTime != null && startTime != null) {
+					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+					differentDays = DateUtil.daysBetween(sdf.format(new Date()), sdf.format(endTime)) + 1;
+					if (differentDays < 0) {
+						differentDays = 0;
+					}
+				}
+				// 鍓╀綑澶╂暟
+				Map<String, Object> remainDays = new HashMap<String, Object>();
+				remainDays.put("content", "杩樺墿" + differentDays + "澶╄繃鏈�");
+				remainDays.put("fontColor", "#F14242");
+				userCouponVO.setRemainDays(remainDays);
+			}
+
+			Map<String, Object> jumpBtn = null;
+			CouponTypeEnum type = systemCoupon.getType();
+			Integer stateActivated = userCouponVO.getStateActivated();
+
+			// 鏈縺娲�
+			if (stateActivated == null || stateActivated == 0) {
+				userCouponVO.setCouponEffect("寰呮縺娲�");
+				userCouponVO.setCouponRule(systemCoupon.getRemark());
+				if (UserSystemCoupon.STATE_CAN_USE == state) {
+					state = 0;
+					userCouponVO.setState(state);
+					if (CouponTypeEnum.freeCoupon == type) {
+						List<String> listTip = new ArrayList<String>();
+						listTip.add("鏈厤鍗曞埜鐢卞ソ鍙嬭禒閫侊紝浠庤幏璧犳棩璧�60澶╁唴闇�浜х敓3绗旇繑鍒╄鍗曪紱");
+						listTip.add("杩斿埄璁㈠崟鈥滃凡鍒拌处鈥濆悗锛屾柟鑳借涓鸿鍗曚骇鐢熸垚鍔燂紱");
+						listTip.add("婊¤冻鏉′欢鍚庯紝绯荤粺灏嗚嚜鍔ㄦ縺娲伙紝骞跺湪娑堟伅-鍏跺畠娑堟伅涓彁閱掋��");
+						userCouponVO.setTips(listTip);
+						userCouponVO.setPopup(true);
+						// 缁熻寰呮縺娲绘暟閲�
+						if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+							int activateCount = userSystemCouponActivateService.getActivateCount(userCouponVO.getId());
+							String activateNum = configService.get(ConfigKeyEnum.freeCouponActivateNum.getKey());
+							userCouponVO.setCouponEffect(
+									"(" + activateCount + "/" + Integer.parseInt(activateNum) + ")寰呮縺娲�");
+						}
+					} else if (CouponTypeEnum.welfareFreeCoupon == type) {
+						jumpBtn = new HashMap<String, Object>();
+						if (inviteCode != null && inviteCode.trim().length() > 0) {
+							jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_friends"));
+						} else {
+							jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_activate"));
+						}
+					}
+				}
+			}
+
+			if (UserSystemCoupon.STATE_IN_USE == state && (CouponTypeEnum.freeCouponBuy == type
+					|| CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type)) {
+				List<String> listTip = new ArrayList<String>();
+				listTip.add("绯荤粺姝e湪鍒ゆ柇鏄惁绗﹀悎鍏嶅崟闇�姹傦紱");
+				listTip.add("绯荤粺姝e湪鍚屾娣樺疂璁㈠崟锛�");
+				listTip.add("鏈娇鐢ㄦ垚鍔熺殑鍏嶅崟鍒镐細鍘熻矾閫�鍥炪��");
+				userCouponVO.setTipsUsing(listTip);
+			}
+
+			// 鏄惁宸茶禒閫�
+			Boolean give = userCouponVO.getGive();
+			if (give == null) {
+				give = false;
+			}
+
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+
+			if (UserSystemCoupon.STATE_CAN_USE == state) {
+				Map<String, Object> jumpLink = new HashMap<String, Object>();
+				if (CouponTypeEnum.freeCouponGive == type) {
+					userCouponVO.setState(UserSystemCoupon.STATE_GIVE_ONLY);
+				} else if (CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type
+						|| CouponTypeEnum.freeCouponBuy == type) {
+					jumpLink.put("url", configService.get(ConfigKeyEnum.freeGoodsList.getKey()));
+					jumpBtn = new HashMap<String, Object>();
+					jumpBtn.put("params", jumpLink);
+					jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("web"));
+				} else if (CouponTypeEnum.rebatePercentCoupon == type) {
+					if (userInviteService.verifyVIP(uid)) { // 浼氬憳鍙彲璧犻��
+						userCouponVO.setState(UserSystemCoupon.STATE_GIVE_ONLY);
+					} else {// 鍙娇鐢� 鍙禒閫�
+						userCouponVO.setState(UserSystemCoupon.STATE_USE_GIVE);
+
+						jumpLink.put("state", "2"); // 宸叉敹璐�
+						jumpLink.put("showNav", false); // 涓嶆樉绀轰笂鏂圭粺璁′俊鎭�
+						jumpLink.put("type", "1"); // 杩斿埄璁㈠崟
+						jumpLink.put("title", "杩斿埄璁㈠崟"); // 鏍囬鍚�
+						jumpLink.put("goodsType", "0"); // 璁㈠崟鏉ユ簮
+						jumpBtn = new HashMap<String, Object>();
+						jumpBtn.put("params", jumpLink);
+						jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("order_screen_list"));
+					}
+				}
+			} else if (UserSystemCoupon.STATE_IN_USE == state && give) {
+				userCouponVO.setCouponEffect("璧犻�佷腑");
+				userCouponVO.setCouponRule(systemCoupon.getRemark());
+				String tips = null;
+
+				TokenTypeEnum tokenType = null;
+				if (CouponTypeEnum.freeCouponGive == type) {
+					userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
+					tips = configService.get(ConfigKeyEnum.giveFreeCouponTips.getKey());
+					tokenType = TokenTypeEnum.freeCoupon;
+				}
+
+				if (CouponTypeEnum.rebatePercentCoupon == type) {
+					userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
+					tips = configService.get(ConfigKeyEnum.giveRebatePercentCouponTips.getKey());
+					tokenType = TokenTypeEnum.rebatePercentCoupon;
+				}
+
+				if (!StringUtil.isNullOrEmpty(tips) && tokenType != null) {
+					UserSystemCouponGiveRecord record = userSystemCouponGiveRecordService.getRecordByUidAndCouponId(uid,
+							userCouponVO.getId());
+					if (record != null) {
+						TokenRecord tokenRecord = tokenRecordService.getNearByTypeAndIdentify(tokenType.name(),
+								record.getId().toString());
+						if (tokenRecord != null && !StringUtil.isNullOrEmpty(tokenRecord.getToken())) {
+							String projectChineseName = Constant.systemCommonConfig.getProjectChineseName();
+							while (tips.contains("{APP鍚嶇О}")) {
+								tips = tips.replace("{APP鍚嶇О}", projectChineseName);
+							}
+							tips = tips.replace("{鍙d护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}",
+									configService.get(ConfigKeyEnum.appDownLink.getKey()));
+							userCouponVO.setGiveTips(tips);
+						}
+
+						Date endTimeGive = record.getEndTime();
+						if (endTimeGive != null) {
+							Map<String, Object> remainDays = new HashMap<String, Object>();
+							remainDays.put("content", "鍓╀綑" + DateUtil.dateDiff2(new Date(), endTimeGive) + "杩囨湡");
+							remainDays.put("fontColor", "#F14242");
+							userCouponVO.setRemainDays(remainDays);
+						}
+					}
+				}
+			} else if (UserSystemCoupon.STATE_END_USE == state) {
+
+				if (give) {
+					userCouponVO.setCouponRule(systemCoupon.getRemark());
+					if (CouponTypeEnum.freeCouponGive == type) {
+						userCouponVO.setCouponEffect("浠绘��0鍏冭喘");
+						userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);
+					}
+
+					if (CouponTypeEnum.rebatePercentCoupon == type) {
+						userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);
+					}
+
+					Date useTime = userCouponVO.getUseTime();
+					if (useTime != null) {
+						Map<String, Object> remainDays = new HashMap<String, Object>();
+						remainDays.put("content", "浜�" + sdf.format(useTime) + "璧犻��");
+						remainDays.put("fontColor", "#CCCCCC");
+						userCouponVO.setRemainDays(remainDays);
+					}
+				} else {
+					Date useTime = userCouponVO.getUseTime();
+					if (useTime != null) {
+						Map<String, Object> remainDays = new HashMap<String, Object>();
+						remainDays.put("content", "浜�" + sdf.format(useTime) + "浣跨敤");
+						remainDays.put("fontColor", "#CCCCCC");
+						userCouponVO.setRemainDays(remainDays);
+					}
+				}
+
+			} else if (UserSystemCoupon.STATE_OVERDUE == state) {
+				if (endTime != null) {
+					Map<String, Object> remainDays = new HashMap<String, Object>();
+					remainDays.put("content", "浜�" + sdf.format(endTime) + "杩囨湡");
+					remainDays.put("fontColor", "#CCCCCC");
+					userCouponVO.setRemainDays(remainDays);
+				}
+
+				if (give)
+					userCouponVO.setCouponRule(systemCoupon.getRemark());
+			}
+			userCouponVO.setJumpBtn(jumpBtn);
+		}
+		return listVO;
+	}
+
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public UserSystemCouponVO giveCoupon(Long uid, Long id) throws UserSystemCouponException {
+		UserSystemCoupon userSystemCoupon = userSystemCouponMapper.selectByPrimaryKey(id);
+		if (userSystemCoupon == null)
+			throw new UserSystemCouponException(1, "璇ュ埜宸蹭笉瀛樺湪");
+
+		SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
+		if (systemCoupon == null)
+			throw new UserSystemCouponException(1, "璇ュ埜宸蹭笉瀛樺湪");
+
+		systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+		if (systemCoupon == null)
+			throw new UserSystemCouponException(1, "璇ュ埜宸插け鏁�");
+
+		Integer state = userSystemCoupon.getState();
+		if (state != UserSystemCoupon.STATE_CAN_USE)
+			throw new UserSystemCouponException(1, "璇ュ埜宸茶浣跨敤鎴栬禒閫�");
+
+		CouponTypeEnum type = systemCoupon.getType();
+		if (type != CouponTypeEnum.freeCouponGive && type != CouponTypeEnum.rebatePercentCoupon)
+			throw new UserSystemCouponException(1, "璇ュ埜涓嶆敮鎸佽禒閫�");
+
+		String tips = null;
+		TokenTypeEnum tokenTypeEnum = null;
+		if (type == CouponTypeEnum.freeCouponGive) {
+			tokenTypeEnum = TokenTypeEnum.freeCoupon;
+			tips = configService.get(ConfigKeyEnum.giveFreeCouponTips.getKey());
+		} else if (type == CouponTypeEnum.rebatePercentCoupon) {
+			tokenTypeEnum = TokenTypeEnum.rebatePercentCoupon;
+			tips = configService.get(ConfigKeyEnum.giveRebatePercentCouponTips.getKey());
+		} else {
+			throw new UserSystemCouponException(1, "璇ュ埜涓嶆敮鎸佽禒閫�");
+		}
+
+		if (StringUtil.isNullOrEmpty(tips))
+			throw new UserSystemCouponException(1, "tips鏁版嵁缂哄け");
+
+		// 鏄惁鏈�杩戠敓鎴愬彛浠ゆ湁鏁�
+		UserSystemCouponGiveRecord record = userSystemCouponGiveRecordService.getRecordByUidAndCouponId(uid, id);
+		if (record != null) {
+			TokenRecord tokenRecord = tokenRecordService.getNearByTypeAndIdentify(tokenTypeEnum.name(), id + "");
+			if (tokenRecord != null && !StringUtil.isNullOrEmpty(tokenRecord.getToken())) {
+				String projectChineseName = Constant.systemCommonConfig.getProjectChineseName();
+				while (tips.contains("{APP鍚嶇О}")) {
+					tips = tips.replace("{APP鍚嶇О}", projectChineseName);
+				}
+				tips = tips.replace("{鍙d护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}",
+						configService.get(ConfigKeyEnum.appDownLink.getKey()));
+
+				return createUserCouponVOo(userSystemCoupon, systemCoupon, record, tips);
+			}
+		}
+
+		Date nowDate = new Date();
+		Date endTime = DateUtil.plusDayDate(Constant.GIVE_DAYS, nowDate);
+		// 鎻掑叆璧犻�佽褰�
+		UserSystemCouponGiveRecord giveRecord = new UserSystemCouponGiveRecord();
+		giveRecord.setCouponId(id);
+		giveRecord.setGiveUid(uid);
+		giveRecord.setGiveTime(nowDate);
+		giveRecord.setEndTime(endTime);
+		userSystemCouponGiveRecordService.insertSelective(giveRecord);
+
+		// 鍒涘缓璁板綍
+		TokenRecord tokenRecord = new TokenRecord();
+		tokenRecord.setUid(uid);
+		tokenRecord.setIdentify(giveRecord.getId() + "");
+		tokenRecord.setType(tokenTypeEnum);
+		tokenRecord.setStartTime(nowDate);
+		tokenRecord.setEndTime(endTime);
+		tokenRecord.setState(0);
+		tokenRecordService.insertSelective(tokenRecord);
+
+		// 鍒涘缓鍙d护
+		String token = TokenUtil.createToken(tokenRecord.getId());
+		tokenRecord.setToken(token);
+		tokenRecordService.updateByPrimaryKeySelective(tokenRecord);
+
+		// 鍒哥姸鎬�
+		userSystemCoupon.setState(UserSystemCoupon.STATE_IN_USE);
+		userSystemCoupon.setGive(true);
+		userSystemCoupon.setUpdateTime(nowDate);
+		userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+
+		// 鎻掑叆浣跨敤鍒歌褰�
+		UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
+		couponRecord.setState(UserSystemCouponRecord.STATE_GIVE_ON);
+		couponRecord.setUserSystemCoupon(userSystemCoupon);
+		couponRecord.setCouponType(type.name());
+		couponRecord.setCreateTime(nowDate);
+		couponRecord.setUpdateTime(nowDate);
+		userSystemCouponRecordService.insertSelective(couponRecord);
+
+		String projectChineseName = Constant.systemCommonConfig.getProjectChineseName();
+		while (tips.contains("{APP鍚嶇О}")) {
+			tips = tips.replace("{APP鍚嶇О}", projectChineseName);
+		}
+		tips = tips.replace("{鍙d护}", token).replace("{涓嬭浇閾炬帴}", configService.get(ConfigKeyEnum.appDownLink.getKey()));
+
+		UserSystemCouponVO couponVO = createUserCouponVOo(userSystemCoupon, systemCoupon, giveRecord, tips);
+
+		UserSystemCouponUseMQMsg msg = new UserSystemCouponUseMQMsg();
+		msg.setUserSystemCouponId(id);
+		msg.setCouponType(type.name());
+		Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.systemCouponDrawback, msg);
+		// 寤惰繜涓�鍒嗛挓
+		message.setStartDeliverTime(endTime.getTime() + 1000 * 60);
+		try {
+			producer.send(message);
+		} catch (Exception e) {
+			throw new UserSystemCouponException(1, "鍒涘缓璧犻�佷俊鎭け璐�");
+		}
+
+		return couponVO;
+	}
+
+	private UserSystemCouponVO createUserCouponVOo(UserSystemCoupon userSystemCoupon, SystemCoupon systemCoupon,
+			UserSystemCouponGiveRecord record, String tips) {
+		UserSystemCouponVO userCouponVO = new UserSystemCouponVO();
+		userCouponVO.setId(userSystemCoupon.getId());
+		userCouponVO.setUid(userSystemCoupon.getUid());
+		userCouponVO.setSource("鏉ユ簮锛�" + userSystemCoupon.getSource());
+		userCouponVO.setCouponName(systemCoupon.getName());
+		userCouponVO.setCouponEffect("璧犻�佷腑");
+		userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
+		userCouponVO.setCouponRule(systemCoupon.getRemark());
+		userCouponVO.setCouponRuleLink(systemCoupon.getRuleLink());
+		userCouponVO.setCouponPicture(systemCoupon.getPicture());
+		userCouponVO.setGiveTips(tips);
+
+		String couponTerm = "鏈夋晥鏈燂細";
+		Date startTime = userCouponVO.getStartTime();
+		Date endTime = userCouponVO.getEndTime();
+		if (endTime != null && startTime != null) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+			couponTerm = couponTerm + sdf.format(startTime) + "-" + sdf.format(endTime);
+		}
+		userCouponVO.setCouponTerm(couponTerm);
+
+		Map<String, Object> remainDays = new HashMap<String, Object>();
+		remainDays.put("content", "鍓╀綑23鏃�59鍒嗚繃鏈�");
+		remainDays.put("fontColor", "#F14242");
+		userCouponVO.setRemainDays(remainDays);
+
+		return userCouponVO;
+	}
+
+	@Transactional
+	@Override
+	public void updateInvalidSate(Long uid) {
+		List<UserSystemCoupon> list = userSystemCouponMapper.getCounponNowInvalidByUid(uid);
+		if (list == null || list.size() == 0) {
+			return;
+		}
+		updateCounponInvalid(list);
+	}
+
+	@Override
+	public void updateCounponInvalid(List<UserSystemCoupon> list) {
+		if (list == null || list.size() == 0) {
+			return;
+		}
+
+		for (UserSystemCoupon userSystemCoupon : list) {
+			UserSystemCoupon userCoupon = new UserSystemCoupon();
+			userCoupon.setUpdateTime(new Date());
+			userSystemCoupon.setState(UserSystemCoupon.STATE_OVERDUE);
+			userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+
+			SystemCoupon baseCoupon = userSystemCoupon.getSystemCoupon();
+			if (baseCoupon == null) {
+				continue;
+			}
+
+			baseCoupon = systemCouponService.selectByPrimaryKey(baseCoupon.getId());
+			if (baseCoupon == null || baseCoupon.getId() == null) {
+				continue;
+			}
+
+			
+			try { // 娑堟伅鎺ㄩ��
+				Long uid = userCoupon.getUid();
+				String source = userCoupon.getSource();
+				 if (baseCoupon.getType() == CouponTypeEnum.freeCoupon || baseCoupon.getType() == CouponTypeEnum.freeCouponBuy) {
+					 userOtherMsgNotificationService.freeCouponEndMsg(uid, "鑷喘鍏嶅崟鍒�", source, 1, "宸茶繃鏈�");
+				 } else if (baseCoupon.getType() == CouponTypeEnum.freeCouponGive) {
+					 userOtherMsgNotificationService.freeCouponEndMsg(uid, "璧犻�佸厤鍗曞埜", source, 1, "宸茶繃鏈�");
+				} if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
+					 userOtherMsgNotificationService.rewardCouponEndMsg(uid, source, 1, "宸茶繃鏈�");
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
 	}
 
 	/**
@@ -1336,154 +2039,444 @@
 	 * 
 	 * @param userSystemCoupon
 	 */
-	public void sendBackCoupon(UserSystemCoupon userSystemCoupon, UserSystemCouponRecord record) throws Exception {
+	public void sendBackCoupon(UserSystemCoupon userCoupon, UserSystemCouponRecord record) throws Exception {
+		if (userCoupon == null)
+			return;
 
-		int expiryDay = 15;
+		Integer state = userCoupon.getState();
+		if (state != UserSystemCoupon.STATE_IN_USE)
+			return;
 
-		SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
-		SystemCoupon coupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
-		if (coupon != null) {
-			expiryDay = coupon.getExpiryDay();
+		Date now = new Date();
+		Date endTime = userCoupon.getEndTime();
+		if (endTime != null && endTime.getTime() < now.getTime()) {
+			// 杩囨湡
+			List<UserSystemCoupon> list = new ArrayList<UserSystemCoupon>();
+			list.add(userCoupon);
+			updateCounponInvalid(list);
+			return;
 		}
 
-		// 缁撴潫鏃ユ湡
-		Date endTime = null;
-		try {
-			// 浠婂ぉ鍦ㄥ唴  鍑忓幓涓�澶�
-			String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
-			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-			endTime = format.parse(endDay);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-		// 鐘舵�佸垵濮嬪寲
-		userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+		// 閫�鍥炲埜
+		UserSystemCoupon userSystemCoupon = new UserSystemCoupon();
+		userSystemCoupon.setId(userCoupon.getId());
+		userSystemCoupon.setGive(false);
 		userSystemCoupon.setUseTime(null);
-		// 鏈夋晥鏈熸椂闂撮噸鏂板畾涔�
-		userSystemCoupon.setStartTime(new Date());
-		userSystemCoupon.setEndTime(endTime);
-
+		userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
 		userSystemCoupon.setUpdateTime(new Date());
+		userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
 
-		userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
+		// 浣跨敤璁板綍
+		if (record != null) {
+			Long uid = userCoupon.getUid();
+			String source = userCoupon.getSource();
+			Date startTime = userCoupon.getStartTime();
+			if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType()) 
+					|| CouponTypeEnum.freeCouponBuy.name().equals(record.getCouponType())) {
+				userOtherMsgNotificationService.freeCouponWinMsg(uid, "鑷喘鍏嶅崟鍒�", source, 1, "浣跨敤閫�鍥�", startTime, endTime);
+			}
+		}
+	}
 
-		if (CouponTypeEnum.welfareFreeCoupon.name().equals(record.getCouponType())) {
-			userOtherMsgNotificationService.welfareCouponDrawBack(userSystemCoupon, record.getOrderNo());
-		} else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) {
-			userOtherMsgNotificationService.freeSheetCouponDrawBack(userSystemCoupon, record.getOrderNo());
+	@Async()
+	@Transactional
+	@Override
+	public void sendBackTimeOutCoupon(Long uid) {
+		// 鍟嗗搧鐩稿叧鐨勫埜
+		List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
+		if (couponList == null || couponList.size() == 0) {
+			return;
+		}
+
+		List<Long> list = new ArrayList<Long>();
+		for (SystemCoupon systemCoupon : couponList) {
+			list.add(systemCoupon.getId());
+		}
+
+		// 瓒呰繃10鍒嗛挓 鏈鍖归厤鐨勫厤鍗曞埜
+		List<UserSystemCoupon> listUserCoupon = userSystemCouponMapper.getCouponByUsingTimeOut(uid, list, 600L);
+		if (listUserCoupon == null || listUserCoupon.size() == 0) {
+			return;
+		}
+
+		for (UserSystemCoupon userCoupon : listUserCoupon) {
+			// 鐘舵�佸垵濮嬪寲
+			UserSystemCoupon userSystemCoupon = new UserSystemCoupon();
+			userSystemCoupon.setId(userCoupon.getId());
+			userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+			userSystemCoupon.setUseTime(null);
+			userSystemCoupon.setUpdateTime(new Date());
+			userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+
+			UserSystemCouponRecord record = userSystemCouponRecordService.getNearByUserCouponId(userCoupon.getId());
+			if (record != null) {
+				UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
+				couponRecord.setId(record.getId());
+				couponRecord.setUpdateTime(new Date());
+				couponRecord.setState(UserSystemCouponRecord.STATE_WAIT_TIME_OUT);
+				userSystemCouponRecordService.updateByPrimaryKeySelective(couponRecord);
+			}
+		}
+	}
+
+	@Transactional
+	@Override
+	public void sendBackGiveUser(Long uid) {
+		List<UserSystemCouponGiveRecord> list = userSystemCouponGiveRecordService.overdueListByUser(uid);
+		if (list == null || list.size() == 0) {
+			return;
+		}
+		sendBackGiveCoupon(list);
+	}
+
+	@Override
+	@RequestSerializableByKeyService(key = "#couponId")
+	@Transactional(rollbackFor = Exception.class)
+	public void sendBackByGiveId(Long couponId) {
+		if (couponId == null)
+			return;
+
+		UserSystemCoupon userCoupon = userSystemCouponMapper.selectByPrimaryKey(couponId);
+		if (userCoupon == null)
+			return;
+
+		Integer state = userCoupon.getState();
+		if (state != UserSystemCoupon.STATE_IN_USE)
+			return;
+
+		UserSystemCouponGiveRecord giveRecord = userSystemCouponGiveRecordService.getByCouponId(couponId);
+		if (giveRecord == null)
+			return;
+
+		if (giveRecord.getState() != null && giveRecord.getState() != UserSystemCouponGiveRecord.STATE_INIT)
+			return;
+
+		// 鏇存柊璧犻�佽褰�
+		UserSystemCouponGiveRecord updateRecord = new UserSystemCouponGiveRecord();
+		updateRecord.setId(giveRecord.getId());
+		updateRecord.setState(UserSystemCouponGiveRecord.STATE_OVERDUE);
+		userSystemCouponGiveRecordService.updateByPrimaryKeySelective(updateRecord);
+
+		// 鍙d护澶辨晥
+		tokenRecordService.invalidByCoupon(giveRecord.getId());
+
+		Date now = new Date();
+		Date endTime = userCoupon.getEndTime();
+		if (endTime != null && endTime.getTime() < now.getTime()) {
+			List<UserSystemCoupon> list = new ArrayList<UserSystemCoupon>();
+			list.add(userCoupon);
+			updateCounponInvalid(list);
+			return;
+		}
+
+		// 閫�鍥炲埜
+		UserSystemCoupon userSystemCoupon = new UserSystemCoupon();
+		userSystemCoupon.setId(userCoupon.getId());
+		userSystemCoupon.setGive(false);
+		userSystemCoupon.setUseTime(null);
+		userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+		userSystemCoupon.setUpdateTime(new Date());
+		userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+
+		// 浣跨敤璁板綍
+		UserSystemCouponRecord useRecord = userSystemCouponRecordService.getNearByUserCouponId(couponId);
+		if (useRecord != null) {
+			UserSystemCouponRecord useRecordUpdate = new UserSystemCouponRecord();
+			useRecordUpdate.setId(useRecord.getId());
+			useRecordUpdate.setState(UserSystemCouponRecord.STATE_WAIT_TIME_OUT);
+			useRecordUpdate.setUpdateTime(new Date());
+			userSystemCouponRecordService.updateByPrimaryKeySelective(useRecordUpdate);
+		}
+
+		SystemCoupon systemCoupon = userCoupon.getSystemCoupon();
+		if (systemCoupon != null)
+			systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+
+		if (systemCoupon == null)
+			return;
+
+		// 閫�鍥炴秷鎭�
+		Long uid = userCoupon.getUid();
+		String source = userCoupon.getSource();
+		CouponTypeEnum type = systemCoupon.getType();
+		if (CouponTypeEnum.freeCouponGive == type) {
+			userOtherMsgNotificationService.freeCouponWinMsg(uid, type.getDesc(), source, 1, "浣跨敤閫�鍥�", 
+					userCoupon.getStartTime(), userCoupon.getEndTime());
+		} else if (CouponTypeEnum.rebatePercentCoupon == systemCoupon.getType()) {
+			userOtherMsgNotificationService.rewardCouponWinMsg(uid, source, 1, "浣跨敤閫�鍥�",
+					userCoupon.getStartTime(), userCoupon.getEndTime());
 		}
 	}
 
 	@Override
-	@Transactional
-	public void copyLotteryPrize(Long uid, int platform, String device) throws Exception {
+	public void sendBackGiveCoupon(List<UserSystemCouponGiveRecord> overdueList) {
+		for (UserSystemCouponGiveRecord record : overdueList) {
+			if (record.getState() != null && record.getState() != UserSystemCouponGiveRecord.STATE_INIT)
+				continue;
 
-		if (uid == null || device == null) {
-			return;
-		}
+			// 鏇存柊璧犻�佽褰�
+			UserSystemCouponGiveRecord updateRecord = new UserSystemCouponGiveRecord();
+			updateRecord.setId(record.getId());
+			updateRecord.setState(UserSystemCouponGiveRecord.STATE_OVERDUE);
+			userSystemCouponGiveRecordService.updateByPrimaryKeySelective(updateRecord);
 
-		// 鏈櫥闄嗕箣鍓嶆娊濂栬褰�
-		List<DeviceLotteryRecord> list = deviceLotteryRecordService.listByPlatformAndDevice(platform, device);
-		if (list == null || list.size() == 0) {
-			return;
-		}
-
-		// 鑾峰彇棰濆淇℃伅
-		UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
-
-		// 宸茬粡鎶借繃濂栫殑鎴栬�呭凡缁忚繘鍏ヨ繃鎶藉椤甸潰鐨�
-		if (userInfoExtra != null && userInfoExtra.getLotteryNewbies() != null) {
-			return;
-		}
-
-		// 鏄惁鏈夎繃璁㈠崟锛氳繑鍒┿�佸垎浜鍗�
-		boolean hasOrder = commonOrderCountService.hasRebateAndShareOrder(uid);
-		if (hasOrder) {
-			return;
-		}
-
-		int coupon = 0;
-
-		for (DeviceLotteryRecord reviceLotteryRecord : list) {
-
-			// 鍒犻櫎璁板綍
-			deviceLotteryRecordService.deleteByPrimaryKey(reviceLotteryRecord.getId());
-
-			Long systemCouponId = reviceLotteryRecord.getSystemCouponId();
-			if (systemCouponId == null) {
+			// 鏇存柊鍒镐俊鎭�
+			Long couponId = record.getCouponId();
+			if (couponId == null) {
 				continue;
 			}
-			SystemCoupon systemCoupon = systemCouponService.selectByPrimaryKey(systemCouponId);
+
+			// 鍒稿垪琛�
+			UserSystemCoupon userCoupon = userSystemCouponMapper.selectByPrimaryKey(couponId);
+			if (userCoupon == null)
+				continue;
+
+			Integer state = userCoupon.getState();
+			if (state != UserSystemCoupon.STATE_IN_USE)
+				return;
+
+			Date now = new Date();
+			Date endTime = userCoupon.getEndTime();
+			if (endTime != null && endTime.getTime() < now.getTime()) {
+				List<UserSystemCoupon> list = new ArrayList<UserSystemCoupon>();
+				list.add(userCoupon);
+				updateCounponInvalid(list);
+				continue;
+			}
+
+			// 閫�鍥炲埜
+			UserSystemCoupon userSystemCoupon = new UserSystemCoupon();
+			userSystemCoupon.setId(userCoupon.getId());
+			userSystemCoupon.setGive(false);
+			userSystemCoupon.setUseTime(null);
+			userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+			userSystemCoupon.setUpdateTime(new Date());
+			userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+
+			// 浣跨敤璁板綍
+			UserSystemCouponRecord useRecord = userSystemCouponRecordService.getNearByUserCouponId(couponId);
+			if (useRecord != null) {
+				UserSystemCouponRecord useRecordUpdate = new UserSystemCouponRecord();
+				useRecordUpdate.setId(useRecord.getId());
+				useRecordUpdate.setState(UserSystemCouponRecord.STATE_WAIT_TIME_OUT);
+				useRecordUpdate.setUpdateTime(new Date());
+				userSystemCouponRecordService.updateByPrimaryKeySelective(useRecordUpdate);
+			}
+
+			SystemCoupon systemCoupon = userCoupon.getSystemCoupon();
+			if (systemCoupon != null)
+				systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+
+			if (systemCoupon == null)
+				continue;
+
+			// 閫�鍥炴秷鎭�
+			Long uid = userCoupon.getUid();
+			String source = userCoupon.getSource();
+			CouponTypeEnum type = systemCoupon.getType();
+			if (CouponTypeEnum.freeCouponGive == type) {
+				userOtherMsgNotificationService.freeCouponWinMsg(uid, type.getDesc(), source, 1, "浣跨敤閫�鍥�", 
+						userCoupon.getStartTime(), userCoupon.getEndTime());
+			} else if (CouponTypeEnum.rebatePercentCoupon == systemCoupon.getType()) {
+				userOtherMsgNotificationService.rewardCouponWinMsg(uid, source, 1, "浣跨敤閫�鍥�",
+						userCoupon.getStartTime(), userCoupon.getEndTime());
+			}
+		}
+	}
+
+	@Override
+	public boolean getValidRebateCoupon(Long uid) {
+		// 杩囨湡鍒�
+		updateInvalidSate(uid);
+		
+		List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getValidByUidAndType(uid, CouponTypeEnum.rebatePercentCoupon.name());
+		if (listCoupon == null || listCoupon.size() == 0)
+			return false;
+		return true;
+	}
+
+
+	@Override
+	public List<UserSystemCouponVO> listIncludeNotExchange(Long uid) throws Exception {
+		// 杩囨湡鍒�
+		updateInvalidSate(uid);
+
+		// 閫�鍥炲埜
+		sendBackTimeOutCoupon(uid);
+
+
+		List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getValidByUidAndType(uid, CouponTypeEnum.rebatePercentCoupon.name());
+		if (listCoupon == null || listCoupon.size() == 0)
+			return null;
+
+		for (UserSystemCouponVO userCouponVO : listCoupon) {
+			String source = userCouponVO.getSource();
+			if (source != null && "濂栧姳鍒稿ぉ澶╂娊".equals(source)) {
+				source = "澶╁ぉ鎶�";
+			}
+
+			SystemCoupon systemCoupon = userCouponVO.getSystemCoupon();
 			if (systemCoupon == null) {
-				continue;
+				continue; // 鍒镐俊鎭笉瀹屾暣
 			}
 
-			int stateActivated = 1;
-			if (systemCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
-				// 绂忓埄鍒哥姸鎬�
-				long countSuccess = threeSaleSerivce.countSuccessFirstTeam(uid);
-				// 娌℃湁涓嬬骇闃熷憳 --寰呮縺娲�
-				if (countSuccess == 0) {
-					stateActivated = 0;
+			systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+
+			userCouponVO.setSource("鏉ユ簮锛�" + source);
+			userCouponVO.setCouponName(systemCoupon.getName());
+			userCouponVO.setCouponEffect(systemCoupon.getEffect());
+			userCouponVO.setCouponRule(systemCoupon.getRule());
+			userCouponVO.setCouponRuleLink(systemCoupon.getRuleLink());
+			userCouponVO.setCouponPicture(systemCoupon.getPicture());
+			userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());
+
+			int differentDays = 0;
+			String couponTerm = "鏈夋晥鏈燂細";
+			Date startTime = userCouponVO.getStartTime();
+			Date endTime = userCouponVO.getEndTime();
+			if (endTime != null && startTime != null) {
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+				couponTerm = couponTerm + sdf.format(startTime) + "-" + sdf.format(endTime);
+
+				SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+				differentDays = DateUtil.daysBetween(sdf2.format(new Date()), sdf2.format(endTime)) + 1;
+				if (differentDays < 0) {
+					differentDays = 0;
 				}
 			}
-			
-			// 缁撴潫鏃ユ湡
-			// 浠婂ぉ鍦ㄥ唴  鍑忓幓涓�澶�
-			String endDay = DateUtil.plusDay(systemCoupon.getExpiryDay() - 1, new Date());
-			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+			userCouponVO.setCouponTerm(couponTerm);
+
+			// 鍓╀綑澶╂暟
+			Map<String, Object> remainDays = new HashMap<String, Object>();
+			remainDays.put("content", "杩樺墿" + differentDays + "澶╄繃鏈�");
+			String remainDaysFontColor = "";
+
+			Integer stateActivated = userCouponVO.getStateActivated();
+			if (stateActivated == null || stateActivated == 0) {
+				userCouponVO.setState(0);
+				userCouponVO.setCouponEffect("寰呮縺娲�");
+				userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
+				remainDaysFontColor = "#CCCCCC";
+			} else {
+				userCouponVO.setCouponPicture(systemCoupon.getPicture());
+				remainDaysFontColor = "#F14242";
+			}
+
+			remainDays.put("fontColor", remainDaysFontColor);
+			userCouponVO.setRemainDays(remainDays);
+		}
+
+		return listCoupon;
+	}
+
+	@Override
+	public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type) {
+		return userSystemCouponMapper.getFreeCouponByType(uid, type);
+	}
+
+	@RequestSerializableByKeyService(key = "#uid")
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void triggerFreeCouponActivate(Long uid, String orderNo, Integer source) {
+		if (uid == null || source == null || StringUtil.isNullOrEmpty(orderNo))
+			return;
+
+		UserSystemCoupon coupon = userSystemCouponMapper.getNeedActivateCouponByType(uid,
+				CouponTypeEnum.freeCoupon.name());
+		if (coupon == null)
+			return;
+
+		Long id = coupon.getId();
+		UserSystemCouponActivate couponActivate = userSystemCouponActivateService.selectForUpdate(id);
+		if (couponActivate == null)
+			return;
+
+		// 楠岃瘉鍚岃鍗曟槸鍚﹀瓨鍦�
+		String key = orderNo + "_" + source;
+		String ordernos = couponActivate.getOrdernos();
+		if (!StringUtil.isNullOrEmpty(ordernos)) {
+			String[] array = ordernos.split(",");
+			if (array != null)
+				for (int i = 0; i < array.length; i++) {
+					if (array[i].equals(key))
+						return;
+				}
+		}
+
+		// 婵�娲绘暟閲�
+		boolean result = false;
+		int limitNum = Integer.parseInt(configService.get(ConfigKeyEnum.freeCouponActivateNum.getKey()));
+
+		Integer state = couponActivate.getState();
+		int count = couponActivate.getCount();
+		count++;
+		if (count >= limitNum) {
+			result = true;
+			state = UserSystemCouponActivate.STATE_END;
+		}
+
+		if (StringUtil.isNullOrEmpty(ordernos)) {
+			ordernos = key;
+		} else {
+			ordernos = ordernos + "," + key;
+		}
+
+		UserSystemCouponActivate updateActivate = new UserSystemCouponActivate();
+		updateActivate.setId(id);
+		updateActivate.setState(state);
+		updateActivate.setCount(count);
+		updateActivate.setOrdernos(ordernos);
+		updateActivate.setUpdateTime(new Date());
+		userSystemCouponActivateService.updateByPrimaryKeySelective(updateActivate);
+
+		// 婵�娲诲鍔卞埜
+		if (result) {
+			activateFreeCoupon(coupon, limitNum);
+		}
+	}
+
+	/**
+	 * 婵�娲诲埜
+	 * 
+	 * @param coupon
+	 * @param activateNum
+	 */
+	@Transactional
+	private void activateFreeCoupon(UserSystemCoupon coupon, int limitNum) {
+		try {
+			Date nowDate = new Date();
+			SystemCoupon systemCoupon = coupon.getSystemCoupon();
+
+			Integer expiryDay = systemCoupon.getExpiryDay();
+			String endDay = DateUtil.plusDay(expiryDay - 1, nowDate);
+			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			if (endDay != null && endDay.trim().length() > 0) {
+				endDay += " 23:59:59";
+			}
 			Date endTime = format.parse(endDay);
 
 			UserSystemCoupon userCoupon = new UserSystemCoupon();
-			userCoupon.setUid(uid);
-			userCoupon.setSource(UserSystemCoupon.SOURCE_CHOUJIANG);
-			userCoupon.setSystemCoupon(systemCoupon);
-			userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
-			userCoupon.setStateActivated(stateActivated);
-			userCoupon.setStartTime(new Date());
+			userCoupon.setId(coupon.getId());
+			userCoupon.setStateActivated(1);
 			userCoupon.setEndTime(endTime);
-			userCoupon.setCreateTime(new Date());
+			userCoupon.setStartTime(nowDate);
 			userCoupon.setUpdateTime(new Date());
-			// 鎻掑叆鏁版嵁搴�
-			insertSelective(userCoupon);
+			userSystemCouponMapper.updateByPrimaryKeySelective(userCoupon);
 
-			// 鍒告暟閲�
-			coupon++;
-
-			// 娑堟伅鎺ㄩ��
-			try {
-				if (systemCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
-					userOtherMsgNotificationService.welfareCouponGet(userCoupon);
-				} else if (systemCoupon.getType() == CouponTypeEnum.freeCoupon) {
-					userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);
-				} else if (systemCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
-					userOtherMsgNotificationService.rewardCouponGet(userCoupon, systemCoupon.getPercent().intValue());
+			// 娑堟伅
+			executor.execute(new Runnable() {
+				@Override
+				public void run() {
+					Long uid = coupon.getUid();
+					String source = coupon.getSource();
+					userOtherMsgNotificationService.freeCouponWinMsg(uid, "鑷喘鍏嶅崟鍒�", source, 1,
+							"婵�娲绘垚鍔�", nowDate, endTime);
 				}
-
-			} catch (Exception e) {
-				try {
-					LogHelper.errorDetailInfo(e);
-				} catch (Exception e1) {
-					e1.printStackTrace();
-				}
-			}
+			});
+		} catch (Exception e) {
+			e.printStackTrace();
+			LogHelper.errorDetailInfo(e);
 		}
-
-		if (userInfoExtra == null) {
-			userInfoExtra = new UserInfoExtra();
-			userInfoExtra.setUserInfo(new UserInfo(uid));
-		}
-
-		userInfoExtra.setLotteryNewbies(Constant.MAX_COUNT_LOTTERY_NEWBIES - list.size());
-		Integer couponNews = userInfoExtra.getCouponNews();
-		if (couponNews == null) {
-			userInfoExtra.setCouponNews(coupon);
-		} else {
-			userInfoExtra.setCouponNews(couponNews + coupon);
-		}
-		userInfoExtraService.saveUserInfoExtra(userInfoExtra);
-
 	}
-	
-	
+
 }

--
Gitblit v1.8.0