From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图,添加口碑

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 1199 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 598 insertions(+), 601 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 4f3b82c..38dc60c 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
@@ -12,23 +12,24 @@
 
 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.google.gson.Gson;
 import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper;
-import com.yeshi.fanli.dto.msg.MsgOtherCouponActivateDTO;
-import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
-import com.yeshi.fanli.dto.user.coupon.UserSystemCouponUseMQMsgDTO;
+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.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 import com.yeshi.fanli.entity.bus.user.Order;
 import com.yeshi.fanli.entity.bus.user.TokenRecord;
@@ -36,16 +37,17 @@
 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.order.HongBaoOrder;
+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.money.UserMoneyDetailException;
-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;
@@ -70,14 +72,17 @@
 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.factory.msg.MsgOtherSystemGiveDTOFactory;
+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;
@@ -111,6 +116,7 @@
 	@Resource
 	private SystemCouponService systemCouponService;
 
+	@Lazy
 	@Resource
 	private CommonOrderService commonOrderService;
 
@@ -148,6 +154,7 @@
 	@Resource
 	private UserOtherMsgNotificationService userOtherMsgNotificationService;
 
+	@Lazy
 	@Resource
 	private CommonOrderCountService commonOrderCountService;
 
@@ -161,12 +168,20 @@
 	@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) {
@@ -214,121 +229,166 @@
 	}
 
 	@Override
-	@Transactional
-	public UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent,
-			Boolean needNotify) 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 = null;
-		if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name())
-				|| couponType.equals(CouponTypeEnum.freeCoupon.name())
-						| couponType.equals(CouponTypeEnum.freeCouponBuy.name())) {
-			// 鍏嶅崟鍒�
-			coupon = systemCouponService.getCouponByType(couponType);
-		} else if (couponType.equals(CouponTypeEnum.rebatePercentCoupon.name())) {
-			// 闅忔満濂栧姳鍒�
-			if (percent == null || percent.compareTo(new BigDecimal(0)) < 1) {
-				randomRewardCoupon(1, uid, source);
-				return null;
-			} else {
-				coupon = systemCouponService.getCouponByTypeAndPercent(couponType, percent);
-			}
-		}
-
+		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;
-			}
-		} else if (coupon.getType() == CouponTypeEnum.freeCoupon) {
-			stateActivated = 0;
+		// 婵�娲荤姸鎬�
+		int stateActivated = 0;
+		// 鑷喘鍏嶅崟鍒搞�佽禒閫佸厤鍗曞埜鍙洿鎺ヤ娇鐢�
+		if (coupon.getType() == CouponTypeEnum.freeCouponBuy || coupon.getType() == CouponTypeEnum.freeCouponGive) {
+			stateActivated = 1;
 		}
 
+		// 鏈夋晥鏃堕暱
 		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());
+		// 璁$畻缁撴潫鏃ユ湡
+		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);
-					}
-
+				if (notify) { // 娑堟伅鎺ㄩ��
 					try {
-						userInfoExtraService.saveUserInfoExtra(userInfoExtra);
-					} catch (UserInfoExtraException e) {
+						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);
+				}
 			}
 		});
 
-		// 娑堟伅鎺ㄩ��
-		if (needNotify) {
-			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());
-				}
+		return userSystemCoupon;
+	}
 
-			} catch (Exception e) {
-				try {
-					LogHelper.errorDetailInfo(e);
-				} catch (Exception e1) {
-					e1.printStackTrace();
-				}
+	@Override
+	@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;
 			}
 		}
 
-		return 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
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid, boolean changeJump)
 			throws UserSystemCouponException, Exception {
@@ -433,7 +493,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);
@@ -451,7 +511,7 @@
 
 				} else if (UserSystemCoupon.STATE_IN_USE == state) {
 					// 浣跨敤涓�
-					userCouponVO.setInUseExplain(configService.get("free_coupon_using-help"));
+					userCouponVO.setInUseExplain(configService.get(ConfigKeyEnum.freeCouponUsingHelp.getKey()));
 				}
 			}
 
@@ -594,7 +654,7 @@
 		return hasCoupon;
 	}
 
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {
 
@@ -617,7 +677,7 @@
 		return getEnableListByCouponId(uid, 1, couponList);
 	}
 
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId)
 			throws UserSystemCouponException, Exception {
@@ -687,6 +747,23 @@
 	}
 
 	@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;
@@ -703,7 +780,7 @@
 		return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
 	}
 
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void useGoodsCoupon(Long uid, Long id, Long goodId, Integer sourceType)
 			throws UserSystemCouponException, Exception {
@@ -780,7 +857,7 @@
 
 	}
 
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType, AcceptData acceptData)
 			throws UserSystemCouponException, Exception {
@@ -817,47 +894,65 @@
 		if (orderNo == null || orderNo.trim().length() == 0)
 			throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪");
 
-		// 璁㈠崟
-		CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS,
-				sourceType);
-		if (orderVO == null)
-			throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
-
-		// 鐗堟湰鍖哄垎锛�2.0.2
-		if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
-			Date thirdCreateTime = orderVO.getThirdCreateTime();
-			if (thirdCreateTime != null) {
-				long downOrderTime = thirdCreateTime.getTime();
-				long limitDate = Long.parseLong("1573315200000"); // TODO
-																	// 鏃ユ湡寰呯‘瀹�2019-11-10
-				if (downOrderTime > limitDate) {
-					Date endDay = DateUtil.plusDayDate(4, thirdCreateTime);
-					long currentTime = java.lang.System.currentTimeMillis();
-					if (endDay.getTime() > currentTime) {
-						boolean valid = false;
-						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, "璇ヨ鍗曞凡涓嶈兘浣跨敤浣跨敤濂栧姳鍒革紝璇︽儏璇峰挩璇㈠鏈�");
-					}
+		// 妫�鏌ヨ鍗曞彿鏄惁缁存潈
+		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 (weiquan) {
+			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();
+		
 		// 绾㈠寘鐘舵��
 		Integer hongBaoState = orderVO.getHongBaoState();
 		// 绾㈠寘绫诲瀷
@@ -868,8 +963,13 @@
 
 			Order order = orderService.findOrderByOrderIdAndType(orderNo, sourceType);
 			if (order == null)
-				return;
+				throw new UserSystemCouponException(1, "璇ヨ鍗曚笉瀛樺湪");
 
+			// 浣跨敤濂栧姳鍒� 閲戦棰濋檺鍒�
+			if (hongBao.compareTo(Constant.REWARD_COUPON_LIMIT_MONEY) > 0){
+				throw new UserSystemCouponException(1, "璇ヨ鍗曚笉鑳戒娇鐢ㄥ鍔卞埜");
+			}
+			
 			/* 濂栭噾璁$畻 浠ュ強鐩稿叧绾㈠寘淇℃伅澶勭悊 */
 
 			// 杞崲鎴愬皬鏁扮偣
@@ -877,81 +977,121 @@
 			// 鎻愭垚閲戦
 			BigDecimal money = MoneyBigDecimalUtil.mul(hongBao, percent);
 
-			UserSystemCouponUseMQMsgDTO mqMsg = new UserSystemCouponUseMQMsgDTO(userSystemCoupon.getId(),
-					order.getOrderId(), sourceType);
-			// 浜嬪姟娑堟伅
-			Message msg = new Message(MQTopicName.TOPIC_SYSTEM_COUPON_USE.name(),systemCoupon.getType().name(),
-					new Gson().toJson(mqMsg).getBytes());
-			orderTransactionProducer.send(msg, new LocalTransactionExecuter() {
-				@Override
-				public TransactionStatus execute(Message arg0, Object arg1) {
-					try {
-						useRewardCouponCore(userSystemCoupon, money, hongBao, uid, order);
-						return TransactionStatus.CommitTransaction;
-					} catch (UserMoneyDetailException e) {
-						return TransactionStatus.RollbackTransaction;
-					}
-				}
-			}, null);
+			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
-	private void useRewardCouponCore(UserSystemCoupon userSystemCoupon, BigDecimal money, BigDecimal hongBao, Long uid,
-			Order order) throws UserMoneyDetailException {
-		// 1銆佹彃鍏ョ孩鍖呮暟鎹�
-		HongBaoV2 hongBaoV2 = new HongBaoV2();
-		hongBaoV2.setMoney(money);
-		hongBaoV2.setType(HongBaoV2.TYPE_COUPON);
-		hongBaoV2.setState(HongBaoV2.STATE_YILINGQU);
-		hongBaoV2.setVersion(2);
-		hongBaoV2.setCreateTime(new Date());
-		hongBaoV2.setUpdateTime(new Date());
-		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(order.getOrderId(),
-				order.getOrderType(), money, new UserInfo(uid));
-		userMoneyDetailService.addUserMoneyDetail(userMoneyDetail);
-		userInfoService.addMoney(new UserInfo(uid), money);
-
-		// 鎻掑叆璧勯噾閫氱煡
-		userMoneyMsgNotificationService.orderReward(uid, order.getOrderId(), order.getOrderType(), money,
-				userInfoService.selectByPKey(uid).getMyHongBao());
-
-		/* 鐢ㄦ埛鍒镐俊鎭姸鎬佸強璁板綍澶勭悊 */
-
-		Date date = new Date();
-		// 鏇存柊鍒哥姸鎬侊細宸蹭娇鐢�
-		userSystemCoupon.setState(UserSystemCoupon.STATE_END_USE);
-		userSystemCoupon.setUseTime(date);
-		userSystemCoupon.setUpdateTime(date);
-		userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
-
-		// 鎻掑叆浣跨敤鍒歌褰�
-		UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
-		couponRecord.setState(UserSystemCouponRecord.STATE_SUCCESS);
-		couponRecord.setGoodSource(order.getOrderType());
-		couponRecord.setOrderNo(order.getOrderId());
-		couponRecord.setUserSystemCoupon(userSystemCoupon);
-		couponRecord.setCouponType(userSystemCoupon.getSystemCoupon().getType().name());
-		couponRecord.setCreateTime(date);
-		couponRecord.setUpdateTime(date);
-		userSystemCouponRecordService.insertSelective(couponRecord);
-
-		// 娑堟伅鎺ㄩ��
+	@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 {
-			userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon, hongBao, money, order.getOrderId());
+			// 1銆佹彃鍏ョ孩鍖呮暟鎹�
+			HongBaoV2 hongBaoV2 = new HongBaoV2();
+			hongBaoV2.setMoney(money);
+			hongBaoV2.setType(HongBaoV2.TYPE_COUPON);
+			hongBaoV2.setState(HongBaoV2.STATE_YILINGQU);
+			hongBaoV2.setVersion(2);
+			hongBaoV2.setCreateTime(new Date());
+			hongBaoV2.setUpdateTime(new Date());
+			hongBaoV2.setUserInfo(new UserInfo(uid));
+			hongBaoV2.setPreGetTime(new Date());
+			hongBaoV2.setGetTime(new Date());
+
+			hongBaoV2Service.insertSelective(hongBaoV2);
+
+			// 2.鎻掑叆鍏宠仈
+			orderHongBaoMapService.addOrderHongBaoMap(hongBaoV2, order);
+
+			// 璁$畻璇ヨ鍗曞師鏈夎繑鍒�
+			List<HongBaoOrder> hongBaoOrderlist = hongBaoOrderService
+					.listDetailByOrderIdAndSourceType(order.getOrderId(), order.getOrderType());
+			BigDecimal originalMoney = new BigDecimal(0);
+			if (hongBaoOrderlist != null)
+				for (HongBaoOrder ho : hongBaoOrderlist) {
+					if (ho.getHongBaoV2() != null && ho.getHongBaoV2().getState() == HongBaoV2.STATE_YILINGQU)
+						originalMoney = originalMoney.add(ho.getHongBaoV2().getMoney());
+				}
+
+			// 3.鎻掑叆璧勯噾鏄庣粏,鐢ㄦ埛浣欓
+			UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(order.getOrderId(),
+					order.getOrderType(), money, originalMoney, new UserInfo(uid));
+			userMoneyDetailService.addUserMoneyDetail(userMoneyDetail);
+			userInfoService.addMoney(new UserInfo(uid), money);
+
+			/* 鐢ㄦ埛鍒镐俊鎭姸鎬佸強璁板綍澶勭悊 */
+
+			Date date = new Date();
+			// 鏇存柊鍒哥姸鎬侊細宸蹭娇鐢�
+			userSystemCoupon.setState(UserSystemCoupon.STATE_END_USE);
+			userSystemCoupon.setUseTime(date);
+			userSystemCoupon.setUpdateTime(date);
+			userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+
+			SystemCoupon coupon = systemCouponService.selectByPrimaryKey(userSystemCoupon.getSystemCoupon().getId());
+
+			// 鎻掑叆浣跨敤鍒歌褰�
+			UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
+			couponRecord.setState(UserSystemCouponRecord.STATE_SUCCESS);
+			couponRecord.setGoodSource(order.getOrderType());
+			couponRecord.setOrderNo(order.getOrderId());
+			couponRecord.setUserSystemCoupon(userSystemCoupon);
+			couponRecord.setCouponType(coupon.getType().name());
+			couponRecord.setCreateTime(date);
+			couponRecord.setUpdateTime(date);
+			userSystemCouponRecordService.insertSelective(couponRecord);
+
+			int goodsCount = 0;
+			String orderId = order.getOrderId();
+			Integer orderType = order.getOrderType();
+			List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(orderType, orderId);
+			if (orderList != null && orderList.size() > 0) {
+				for (CommonOrder co : orderList) {
+					goodsCount += co.getCount();
+				}
+			}
+			
+			// 璧勯噾娑堟伅
+			UserInfo userInfo = userInfoService.selectByPKey(uid);
+			userMoneyMsgNotificationService.rewardCounponReceived(uid, orderId, orderType, goodsCount,
+					money, userInfo.getMyHongBao(), order.getThirdCreateTime());
+			
+			// 鍒镐娇鐢ㄦ垚鍔熸秷鎭�
+			try {
+				userOtherMsgNotificationService.rewardCouponEndMsg(uid, userSystemCoupon.getSource(), 1, "浣跨敤鎴愬姛");
+			} catch (Exception e) {
+				LogHelper.errorDetailInfo(e);
+			}
+			transactionManager.commit(transactionStatus);
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			e.printStackTrace();
+			transactionManager.rollback(transactionStatus);
+			throw new Exception();
 		}
 
 	}
@@ -1025,9 +1165,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));
 		}
@@ -1086,7 +1226,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";
@@ -1124,7 +1264,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) {
 			// 閫�娆�
@@ -1143,7 +1283,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) {
 			// 鍏嶅崟涓�
@@ -1157,7 +1297,7 @@
 				progressMsg = "鍏嶅崟鍙戣捣锛岀瓑寰呮敹璐�";
 			}
 
-			rewardCouponRemark = configService.get("free_coupon_remark");
+			rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponRemark.getKey());
 
 		} else if (UserSystemCouponRecord.STATE_SUCCESS == stateRecord) {
 			// 鍏嶅崟鎴愬姛
@@ -1179,7 +1319,7 @@
 
 			jumpDetail = jumpDetailV2Service.getByTypeCache("capitalDetails");
 
-			rewardCouponRemark = configService.get("free_coupon_remark");
+			rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponRemark.getKey());
 		}
 		userRecordVO.setProgressState(progressState);
 		userRecordVO.setPayMoney(payMoney);
@@ -1238,59 +1378,7 @@
 		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;
-		}
-
-		// 寰呮椿绂忓埄鍏嶅崟鍒�
-		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 {
 
@@ -1312,7 +1400,7 @@
 		sendBackCoupon(record.getUserSystemCoupon(), record);
 	}
 
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void updateStateByArrivalAccount(String orderNo) throws Exception {
 
@@ -1329,16 +1417,6 @@
 		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);
-		} else if (CouponTypeEnum.freeCouponBuy.name().equals(record.getCouponType())) {
-			userOtherMsgNotificationService.couponUsedFreeSheet(record.getUserSystemCoupon(), orderNo,
-					MsgTypeOtherTypeEnum.freeCouponBuy);
-		}
 	}
 
 	@Override
@@ -1346,7 +1424,7 @@
 		return userSystemCouponMapper.getCounponNowInvalid(count);
 	}
 
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId)
 			throws Exception {
@@ -1410,179 +1488,10 @@
 				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);
-				} else if (CouponTypeEnum.freeCouponBuy.name().equals(couponType)) {
-					userOtherMsgNotificationService.couponUsingFreeSheet(userSystemCoupon, orderNo, payment,
-							MsgTypeOtherTypeEnum.freeCouponBuy);
-				}
 			}
 		}
 
 		return isfree;
-	}
-
-	@Override
-	@Transactional
-	public void copyLotteryPrize(Long uid, int platform, String device) throws Exception {
-
-		return;
-
-		/*
-		 * if (uid == null || device == null) { return; }
-		 * 
-		 * // 鏈櫥闄嗕箣鍓嶆娊濂栬褰� 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 isNewUser = userInfoExtraService.isNewUser(uid); if
-		 * (!isNewUser) { return; }
-		 * 
-		 * int coupon = 0;
-		 * 
-		 * for (DeviceLotteryRecord reviceLotteryRecord : list) {
-		 * 
-		 * // 鍒犻櫎璁板綍
-		 * deviceLotteryRecordService.deleteByPrimaryKey(reviceLotteryRecord.
-		 * getId());
-		 * 
-		 * Long systemCouponId = reviceLotteryRecord.getSystemCouponId(); if
-		 * (systemCouponId == null) { continue; } SystemCoupon systemCoupon =
-		 * systemCouponService.selectByPrimaryKey(systemCouponId); if
-		 * (systemCoupon == null) { continue; }
-		 * 
-		 * int stateActivated = 1; if (systemCoupon.getType() ==
-		 * CouponTypeEnum.welfareFreeCoupon) { // 绂忓埄鍒哥姸鎬� long countSuccess =
-		 * threeSaleSerivce.countSuccessFirstTeam(uid); // 娌℃湁涓嬬骇闃熷憳 --寰呮縺娲� if
-		 * (countSuccess == 0) { stateActivated = 0; } }
-		 * 
-		 * // 缁撴潫鏃ユ湡 // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶� String endDay =
-		 * DateUtil.plusDay(systemCoupon.getExpiryDay() - 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(UserSystemCoupon.SOURCE_NEWBIES);
-		 * userCoupon.setSystemCoupon(systemCoupon);
-		 * 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);
-		 * 
-		 * // 鍒告暟閲� 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()); }
-		 * 
-		 * } catch (Exception e) { try { LogHelper.errorDetailInfo(e); } catch
-		 * (Exception e1) { e1.printStackTrace(); } } }
-		 * 
-		 * 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);
-		 */
-
-	}
-
-	@Override
-	@Transactional
-	public void randomRewardCoupon(int num, Long uid, String source) throws Exception {
-		if (num < 1) {
-			return;
-		}
-
-		for (int i = 0; i < num; i++) {
-
-			// 杩斿埄姣�-闅忔満
-			BigDecimal percent = new BigDecimal(randomNum());
-			// 鏌ヨ濂栧姳鍒�
-			SystemCoupon systemCoupon = systemCouponService
-					.getCouponByTypeAndPercent(CouponTypeEnum.rebatePercentCoupon.name(), percent);
-			if (systemCoupon == null) {
-				return;
-			}
-
-			// 缁撴潫鏃ユ湡 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
-			String endDay = DateUtil.plusDay(systemCoupon.getExpiryDay() - 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(systemCoupon);
-			userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
-			userCoupon.setStateActivated(1);
-			userCoupon.setStartTime(new Date());
-			userCoupon.setEndTime(endTime);
-			userCoupon.setCreateTime(new Date());
-			userCoupon.setUpdateTime(new Date());
-			// 鎻掑叆鏁版嵁搴�
-			insertSelective(userCoupon);
-
-			// 娑堟伅鎺ㄩ��
-			try {
-				userOtherMsgNotificationService.rewardCouponGet(userCoupon, systemCoupon.getPercent().intValue());
-			} catch (Exception e) {
-				try {
-					LogHelper.errorDetailInfo(e);
-				} catch (Exception e1) {
-					e1.printStackTrace();
-				}
-			}
-		}
-
-		// 绂忓埄涓績绾㈢偣
-		UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
-		if (userInfoExtra == null) {
-			return;
-		}
-		Integer couponNews = userInfoExtra.getCouponNews();
-		if (couponNews == null) {
-			userInfoExtra.setCouponNews(num);
-		} else {
-			userInfoExtra.setCouponNews(couponNews + num);
-		}
-		userInfoExtraService.saveUserInfoExtra(userInfoExtra);
-	}
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public void systemGiveRewardCoupon(Long uid, int num, String orderId, Integer orderType, String reason)
-			throws Exception {
-		// 娣诲姞濂栧姳鍒�
-		insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(), "绯荤粺璧犻��",
-				new BigDecimal(configService.get("exchange_rebate_percent")), false);
-		// 娣诲姞濂栧姳鍒告秷鎭�
-		userOtherMsgNotificationService.systemGiveRewardCoupon(uid, null, MsgOtherSystemGiveDTOFactory
-				.createRewardCouponGive(num, "璇锋寜鐓ц繑鍒╁鍔卞埜瑙勫垯浣跨敤", "杩斿埄濂栧姳鍒�", orderId, orderType, reason));
 	}
 
 	/**
@@ -1590,10 +1499,8 @@
 	 * 
 	 * @return
 	 */
-	public int randomNum() {
-
+	private int randomCounponPercent() {
 		int result = 1;
-
 		List<RandomProportion> list = new ArrayList<RandomProportion>();
 		list.add(new RandomProportion(1, 22));
 		list.add(new RandomProportion(2, 22));
@@ -1614,21 +1521,16 @@
 		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;
 	}
 
@@ -1646,7 +1548,7 @@
 	}
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	public void exchangeCoupon(Long uid, String couponType, String source, BigDecimal percent)
 			throws UserSystemCouponException, Exception {
 		if (couponType == null || uid == null) {
@@ -1668,7 +1570,7 @@
 		if (couponType == CouponTypeEnum.freeCoupon.name()) {
 			stateActivated = 0; //
 		} else if (couponType == CouponTypeEnum.welfareFreeCoupon.name()
-				&& threeSaleSerivce.countSuccessFirstTeam(uid) <= 0) {
+				&& threeSaleSerivce.countFirstTeam(uid) <= 0) {
 			stateActivated = 0; // 鏃犱笅绾ч槦鍛� --寰呮縺娲�
 		}
 
@@ -1702,7 +1604,7 @@
 		insertSelective(userCoupon);
 	}
 
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public List<UserSystemCouponVO> getCouponList(AcceptData acceptData, long start, int count, Long uid)
 			throws UserSystemCouponException, Exception {
@@ -1802,8 +1704,9 @@
 						// 缁熻寰呮縺娲绘暟閲�
 						if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
 							int activateCount = userSystemCouponActivateService.getActivateCount(userCouponVO.getId());
-							String activateNum = configService.get("free_coupon_activate_num");
-							userCouponVO.setCouponEffect("(" + activateCount + "/"+ Integer.parseInt(activateNum) +")寰呮縺娲�");
+							String activateNum = configService.get(ConfigKeyEnum.freeCouponActivateNum.getKey());
+							userCouponVO.setCouponEffect(
+									"(" + activateCount + "/" + Integer.parseInt(activateNum) + ")寰呮縺娲�");
 						}
 					} else if (CouponTypeEnum.welfareFreeCoupon == type) {
 						jumpBtn = new HashMap<String, Object>();
@@ -1839,23 +1742,25 @@
 					userCouponVO.setState(UserSystemCoupon.STATE_GIVE_ONLY);
 				} else if (CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type
 						|| CouponTypeEnum.freeCouponBuy == type) {
-					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);
 					jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("web"));
 				} else if (CouponTypeEnum.rebatePercentCoupon == type) {
-					// 鍙娇鐢ㄣ�� 鍙禒閫�
-					userCouponVO.setState(UserSystemCoupon.STATE_USE_GIVE);
+					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"));
+						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("璧犻�佷腑");
@@ -1865,13 +1770,13 @@
 				TokenTypeEnum tokenType = null;
 				if (CouponTypeEnum.freeCouponGive == type) {
 					userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
-					tips = configService.get("give_free_coupon_tips");
+					tips = configService.get(ConfigKeyEnum.giveFreeCouponTips.getKey());
 					tokenType = TokenTypeEnum.freeCoupon;
 				}
 
 				if (CouponTypeEnum.rebatePercentCoupon == type) {
 					userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
-					tips = configService.get("give_rebate_percent_coupon_tips");
+					tips = configService.get(ConfigKeyEnum.giveRebatePercentCouponTips.getKey());
 					tokenType = TokenTypeEnum.rebatePercentCoupon;
 				}
 
@@ -1887,7 +1792,7 @@
 								tips = tips.replace("{APP鍚嶇О}", projectChineseName);
 							}
 							tips = tips.replace("{鍙d护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}",
-									configService.get("app_down_link"));
+									configService.get(ConfigKeyEnum.appDownLink.getKey()));
 							userCouponVO.setGiveTips(tips);
 						}
 
@@ -1946,7 +1851,7 @@
 		return listVO;
 	}
 
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public UserSystemCouponVO giveCoupon(Long uid, Long id) throws UserSystemCouponException {
 		UserSystemCoupon userSystemCoupon = userSystemCouponMapper.selectByPrimaryKey(id);
@@ -1973,10 +1878,10 @@
 		TokenTypeEnum tokenTypeEnum = null;
 		if (type == CouponTypeEnum.freeCouponGive) {
 			tokenTypeEnum = TokenTypeEnum.freeCoupon;
-			tips = configService.get("give_free_coupon_tips");
+			tips = configService.get(ConfigKeyEnum.giveFreeCouponTips.getKey());
 		} else if (type == CouponTypeEnum.rebatePercentCoupon) {
 			tokenTypeEnum = TokenTypeEnum.rebatePercentCoupon;
-			tips = configService.get("give_rebate_percent_coupon_tips");
+			tips = configService.get(ConfigKeyEnum.giveRebatePercentCouponTips.getKey());
 		} else {
 			throw new UserSystemCouponException(1, "璇ュ埜涓嶆敮鎸佽禒閫�");
 		}
@@ -1994,19 +1899,20 @@
 					tips = tips.replace("{APP鍚嶇О}", projectChineseName);
 				}
 				tips = tips.replace("{鍙d护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}",
-						configService.get("app_down_link"));
+						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(DateUtil.plusDayDate(Constant.GIVE_DAYS, nowDate));
+		giveRecord.setEndTime(endTime);
 		userSystemCouponGiveRecordService.insertSelective(giveRecord);
 
 		// 鍒涘缓璁板綍
@@ -2015,7 +1921,7 @@
 		tokenRecord.setIdentify(giveRecord.getId() + "");
 		tokenRecord.setType(tokenTypeEnum);
 		tokenRecord.setStartTime(nowDate);
-		tokenRecord.setEndTime(DateUtil.plusDayDate(Constant.TOKEN_DAYS, nowDate));
+		tokenRecord.setEndTime(endTime);
 		tokenRecord.setState(0);
 		tokenRecordService.insertSelective(tokenRecord);
 
@@ -2043,9 +1949,23 @@
 		while (tips.contains("{APP鍚嶇О}")) {
 			tips = tips.replace("{APP鍚嶇О}", projectChineseName);
 		}
-		tips = tips.replace("{鍙d护}", token).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"));
+		tips = tips.replace("{鍙d护}", token).replace("{涓嬭浇閾炬帴}", configService.get(ConfigKeyEnum.appDownLink.getKey()));
 
-		return createUserCouponVOo(userSystemCoupon, systemCoupon, giveRecord, tips);
+		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,
@@ -2079,7 +1999,6 @@
 		return userCouponVO;
 	}
 
-
 	@Transactional
 	@Override
 	public void updateInvalidSate(Long uid) {
@@ -2112,25 +2031,20 @@
 				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);
-				} else if (baseCoupon.getType() == CouponTypeEnum.freeCouponBuy) {
-					userOtherMsgNotificationService.outOfDate(userSystemCoupon, MsgTypeOtherTypeEnum.freeCouponBuy);
+			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.outOfDate(userSystemCoupon, MsgTypeOtherTypeEnum.freeCouponGive);
+					userOtherMsgNotificationService.freeCouponEndMsg(uid, "璧犻�佸厤鍗曞埜", source, 1, "宸茶繃鏈�");
+				}
+				if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
+					userOtherMsgNotificationService.rewardCouponEndMsg(uid, source, 1, "宸茶繃鏈�");
 				}
 			} catch (Exception e) {
-				try {
-					LogHelper.errorDetailInfo(e);
-				} catch (Exception e1) {
-					e1.printStackTrace();
-				}
+				e.printStackTrace();
 			}
 		}
 	}
@@ -2169,13 +2083,12 @@
 
 		// 浣跨敤璁板綍
 		if (record != null) {
-			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());
-			} else if (CouponTypeEnum.freeCouponBuy.name().equals(record.getCouponType())) {
-				userOtherMsgNotificationService.couponDrawBack(userSystemCoupon, record.getOrderNo(),
-						MsgTypeOtherTypeEnum.freeCouponBuy);
+			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);
 			}
 		}
 	}
@@ -2232,8 +2145,90 @@
 	}
 
 	@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
 	public void sendBackGiveCoupon(List<UserSystemCouponGiveRecord> overdueList) {
 		for (UserSystemCouponGiveRecord record : overdueList) {
+			if (record.getState() != null && record.getState() != UserSystemCouponGiveRecord.STATE_INIT)
+				continue;
+
 			// 鏇存柊璧犻�佽褰�
 			UserSystemCouponGiveRecord updateRecord = new UserSystemCouponGiveRecord();
 			updateRecord.setId(record.getId());
@@ -2291,50 +2286,26 @@
 				continue;
 
 			// 閫�鍥炴秷鎭�
-			String couponName = systemCoupon.getName();
-			if (CouponTypeEnum.freeCouponGive == systemCoupon.getType()) {
-				couponName = "鍏嶅崟鍒�";
+			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()) {
-				couponName = "濂栧姳鍒�";
+				userOtherMsgNotificationService.rewardCouponWinMsg(uid, source, 1, "浣跨敤閫�鍥�", userCoupon.getStartTime(),
+						userCoupon.getEndTime());
 			}
-
-			String beiZhu = "璇峰埌鎴戠殑-绂忓埄涓績鏌ョ湅";
-			SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm");
-			MsgOtherGiveContentDTO msgOther = new MsgOtherGiveContentDTO();
-			msgOther.setType(MsgOtherGiveContentDTO.TYEP_COUPON);
-			msgOther.setTitle(couponName + "閫�鍥�");
-			msgOther.setGiveType("浣犺禒閫佺殑" + couponName + "鏈鎴愬姛棰嗗彇");
-			msgOther.setGiveTime(sd.format(record.getGiveTime()));
-			msgOther.setReturnTime(sd.format(new Date()));
-			userOtherMsgNotificationService.tokenGiveMsg(record.getGiveUid(), beiZhu, msgOther);
 		}
 	}
 
 	@Override
-	public boolean getIncludeExchange(Long uid) {
+	public boolean getValidRebateCoupon(Long uid) {
 		// 杩囨湡鍒�
 		updateInvalidSate(uid);
 
-		String percent = configService.get("exchange_rebate_percent");
-		if (StringUtil.isNullOrEmpty(percent))
-			percent = "35";
-		List<UserSystemCoupon> listCoupon = userSystemCouponMapper.getIncludeExchange(uid, Integer.parseInt(percent),
+		List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getValidByUidAndType(uid,
 				CouponTypeEnum.rebatePercentCoupon.name());
-		if (listCoupon == null || listCoupon.size() == 0)
-			return false;
-		return true;
-	}
-
-	@Override
-	public boolean getIncludeNotExchange(Long uid) {
-		// 杩囨湡鍒�
-		updateInvalidSate(uid);
-
-		String percent = configService.get("exchange_rebate_percent");
-		if (StringUtil.isNullOrEmpty(percent))
-			percent = "35";
-		List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getIncludeNotExchange(uid,
-				Integer.parseInt(percent), CouponTypeEnum.rebatePercentCoupon.name());
 		if (listCoupon == null || listCoupon.size() == 0)
 			return false;
 		return true;
@@ -2348,12 +2319,8 @@
 		// 閫�鍥炲埜
 		sendBackTimeOutCoupon(uid);
 
-		String percent = configService.get("exchange_rebate_percent");
-		if (StringUtil.isNullOrEmpty(percent))
-			percent = "35";
-
-		List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getIncludeNotExchange(uid,
-				Integer.parseInt(percent), CouponTypeEnum.rebatePercentCoupon.name());
+		List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getValidByUidAndType(uid,
+				CouponTypeEnum.rebatePercentCoupon.name());
 		if (listCoupon == null || listCoupon.size() == 0)
 			return null;
 
@@ -2422,78 +2389,108 @@
 		return userSystemCouponMapper.getFreeCouponByType(uid, type);
 	}
 
-	
-	
+	@RequestSerializableByKeyService(key = "#uid")
 	@Override
-	@Transactional
-	public void activateFreeCoupon(Long uid) {
-		List<UserSystemCoupon> list = userSystemCouponMapper.getNeedActivateFreeCouponByType(uid, CouponTypeEnum.freeCoupon.name());
-		if (list == null || list.size() == 0)
+	@Transactional(rollbackFor = Exception.class)
+	public void triggerFreeCouponActivate(Long uid, String orderNo, Integer source) {
+		if (uid == null || source == null || StringUtil.isNullOrEmpty(orderNo))
 			return;
-	
-		UserSystemCoupon coupon = list.get(0);
-		Date nowDate = new Date();
-		Date endTime2 = coupon.getEndTime();
-		if (endTime2 != null && endTime2.getTime() <= nowDate.getTime())
-			return; // 宸插け鏁�
 
-		SystemCoupon systemCoupon = coupon.getSystemCoupon();
-		if (systemCoupon == null)
-			return; // 鍒稿凡涓嶅瓨鍦�
+		UserSystemCoupon coupon = userSystemCouponMapper.getNeedActivateCouponByType(uid,
+				CouponTypeEnum.freeCoupon.name());
+		if (coupon == null)
+			return;
 
-		systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
-		if (systemCoupon == null || systemCoupon.getType() != CouponTypeEnum.freeCoupon)
-			return; // 鍒哥被鍨嬩笉鍖归厤
+		Long id = coupon.getId();
+		UserSystemCouponActivate couponActivate = userSystemCouponActivateService.selectForUpdate(id);
+		if (couponActivate == null)
+			return;
 
-		
-		// 娣诲姞婵�娲绘暟閲�
-		String activateNum = configService.get("free_coupon_activate_num");
-		boolean activate = userSystemCouponActivateService.addActivateCount(coupon.getId(), Integer.parseInt(activateNum));
-		
-		// 婵�娲诲埜
-		if (activate) {
-			
-			try {
-				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";
+		// 楠岃瘉鍚岃鍗曟槸鍚﹀瓨鍦�
+		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;
 				}
-				Date endTime = format.parse(endDay);
+		}
 
-				UserSystemCoupon userCoupon = new UserSystemCoupon();
-				userCoupon.setId(coupon.getId());
-				userCoupon.setStateActivated(1);
-				userCoupon.setEndTime(endTime);
-				userCoupon.setStartTime(nowDate);
-				userCoupon.setUpdateTime(new Date());
-				userSystemCouponMapper.updateByPrimaryKeySelective(userCoupon);
+		// 婵�娲绘暟閲�
+		boolean result = false;
+		int limitNum = Integer.parseInt(configService.get(ConfigKeyEnum.freeCouponActivateNum.getKey()));
 
-				// 璧犻�佽褰�
-				UserSystemCouponGiveRecord giveRecord = userSystemCouponGiveRecordService.getByReceiveId(coupon.getId());
-				if (giveRecord == null)
-					return;
+		Integer state = couponActivate.getState();
+		int count = couponActivate.getCount();
+		count++;
+		if (count >= limitNum) {
+			result = true;
+			state = UserSystemCouponActivate.STATE_END;
+		}
 
-				Long giveUid = giveRecord.getGiveUid();
-				UserInfo userInfo = userInfoService.selectByPKey(giveUid);
-				if (userInfo == null)
-					return;
+		if (StringUtil.isNullOrEmpty(ordernos)) {
+			ordernos = key;
+		} else {
+			ordernos = ordernos + "," + key;
+		}
 
-				String beiZhu = "璇峰埌鎴戠殑-绂忓埄涓績涓煡鐪�";
-				SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm");
-				MsgOtherCouponActivateDTO msgOther = new MsgOtherCouponActivateDTO();
-				msgOther.setTitle("鍏嶅崟鍒告縺娲�");
-				msgOther.setType("鍏嶅崟鍒哥郴缁熷凡鑷姩婵�娲�");
-				msgOther.setExplain("婊¤冻" + systemCoupon.getActivateDay() + "澶╁唴浜х敓" + activateNum + "绗斿凡鍒拌处杩斿埄璁㈠崟");
-				msgOther.setGiveUser("鏄电О锛�" + userInfo.getNickName() + " ID锛�" + giveUid);
-				msgOther.setReceiveTime(sd.format(giveRecord.getReceiveTime()));
-				msgOther.setValidityTime(expiryDay + "澶�");
-				userOtherMsgNotificationService.giveCouponActivateMsg(uid, beiZhu, msgOther);
-			} catch (Exception e) {
-				e.printStackTrace();
-				LogHelper.errorDetailInfo(e);
-			}
+		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.setId(coupon.getId());
+			userCoupon.setStateActivated(1);
+			userCoupon.setEndTime(endTime);
+			userCoupon.setStartTime(nowDate);
+			userCoupon.setUpdateTime(new Date());
+			userSystemCouponMapper.updateByPrimaryKeySelective(userCoupon);
+
+			// 娑堟伅
+			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) {
+			e.printStackTrace();
+			LogHelper.errorDetailInfo(e);
+		}
+	}
+
 }

--
Gitblit v1.8.0