From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java |  906 ++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 649 insertions(+), 257 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 463116b..169bb92 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;
@@ -17,18 +16,21 @@
 import org.yeshi.utils.DateUtil;
 
 import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper;
+import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
+import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
 import com.yeshi.fanli.entity.bus.user.DeviceLotteryRecord;
 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.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.push.PushCoupon;
-import com.yeshi.fanli.entity.push.PushCouponRecord;
 import com.yeshi.fanli.entity.system.SystemCoupon;
 import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -50,14 +52,18 @@
 import com.yeshi.fanli.service.inter.push.PushCouponRecordService;
 import com.yeshi.fanli.service.inter.push.PushCouponService;
 import com.yeshi.fanli.service.inter.user.DeviceLotteryRecordService;
+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.UserSystemCouponGiveRecordService;
 import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
 import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
 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.TokenUtil;
 import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
@@ -79,6 +85,9 @@
 	@Resource
 	private UserSystemCouponMapper userSystemCouponMapper;
 
+	@Resource
+	private UserSystemCouponGiveRecordService userSystemCouponGiveRecordService;
+	
 	@Resource
 	private ConfigService configService;
 
@@ -136,6 +145,9 @@
 	@Resource
 	private PushCouponRecordService pushCouponRecordService;
 	
+	@Resource
+	private TokenRecordService tokenRecordService;
+	
 	
 	@Override
 	public int insertSelective(UserSystemCoupon record) {
@@ -179,7 +191,7 @@
 
 	@Override
 	@Transactional
-	public void insertUserCoupon(Long uid, String couponType, String source)
+	public void insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent)
 			throws UserSystemCouponException, Exception {
 
 		if (couponType == null || uid == null) {
@@ -187,12 +199,18 @@
 		}
 
 		SystemCoupon coupon = null;
-		if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name())) {
-			// 绂忓埄鍏嶅崟鍒�
+		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())) {
-			// 濂栧姳鍒�10%
-			coupon = systemCouponService.getCouponByTypeAndPercent(couponType,new BigDecimal(10));
+			// 闅忔満濂栧姳鍒�
+			if (percent == null || percent.compareTo(new BigDecimal(0)) < 1) {
+				randomRewardCoupon(1, uid, source);
+				return;
+			}  else {
+				coupon = systemCouponService.getCouponByTypeAndPercent(couponType, percent);
+			}
 		}
 		
 		if (coupon == null) {
@@ -207,11 +225,20 @@
 			if (countSuccess == 0) {
 				stateActivated = 0;
 			}
+		} else if (coupon.getType() == CouponTypeEnum.freeCoupon) {
+			stateActivated = 0;
 		}
 
+		Integer expiryDay = null;
+		if (stateActivated == 0) 
+			expiryDay = coupon.getActivateDay();
+			
+		if (expiryDay == null || expiryDay == 0) 
+			expiryDay = coupon.getExpiryDay();
+		
 		// 缁撴潫鏃ユ湡
 		// 浠婂ぉ鍦ㄥ唴  鍑忓幓涓�澶�
-		String endDay = DateUtil.plusDay(coupon.getExpiryDay() - 1, new Date());
+		String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
 		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 		Date endTime = format.parse(endDay);
 
@@ -278,12 +305,8 @@
 			return null;
 		}
 
-		// 鏇存柊杩囨湡鍒�
-		updateCounponInvalid(uid);
 		// 閫�鍥炲埜
 		sendBackTimeOutCoupon(uid);
-		// 娲诲姩棰嗗彇鍒�
-		receivedCoupon(uid);
 		
 		List<UserSystemCouponVO> listVO = userSystemCouponMapper.getUserCouponVOList(start, count, uid);
 		if (listVO == null || listVO.size() == 0) {
@@ -461,11 +484,16 @@
 			}
 
 			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());
+			userCouponVO.setCouponPicture(systemCoupon.getPicture());
 			userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());
 
 			int differentDays = 0;
@@ -482,7 +510,6 @@
 					differentDays = 0;
 				}
 			}
-
 			userCouponVO.setCouponTerm(couponTerm);
 
 			// 鍓╀綑澶╂暟
@@ -495,12 +522,9 @@
 				userCouponVO.setState(0);
 				userCouponVO.setCouponEffect("寰呮縺娲�");
 				userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
-
 				remainDaysFontColor = "#CCCCCC";
-
 			} else {
 				userCouponVO.setCouponPicture(systemCoupon.getPicture());
-
 				remainDaysFontColor = "#F14242";
 			}
 
@@ -511,6 +535,7 @@
 		return listVO;
 	}
 
+	
 	/**
 	 * 鏄惁瀛樺湪濂栧姳鍒�
 	 * 
@@ -543,12 +568,8 @@
 			throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
 		}
 
-		// 鏇存柊杩囨湡鍒�
-		updateCounponInvalid(uid);
 		// 閫�鍥炲埜
 		sendBackTimeOutCoupon(uid);
-		// 娲诲姩棰嗗彇鍒�
-		receivedCoupon(uid);
 
 		// 璁㈠崟鐩稿叧鐨勫埜
 		List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();
@@ -572,14 +593,9 @@
 			throw new UserSystemCouponException(1, "鍟嗗搧ID涓虹┖");
 		}
 
-		// 鏇存柊杩囨湡鍒�
-		updateCounponInvalid(uid);
 		// 閫�鍥炲埜
 		sendBackTimeOutCoupon(uid);
 		
-		// 娲诲姩棰嗗彇鍒�
-		receivedCoupon(uid);
-
 		// 鍟嗗搧鐩稿叧鐨勫埜
 		List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
 		if (couponList == null || couponList.size() == 0) {
@@ -587,12 +603,11 @@
 		}
 
 		List<UserSystemCouponVO> list = getEnableListByCouponId(uid, null, couponList);
-
+		
 		// 鑾峰彇鍟嗗搧璇︽儏
 		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) {
@@ -606,7 +621,6 @@
 							map.put("fontColor", "#CCCCCC");
 						}
 						userCouponVO.setRemainDays(map);
-
 					}
 				}
 			}
@@ -617,7 +631,7 @@
 
 	@Transactional
 	@Override
-	public void useGoodsCoupon(Long uid, Long id, Long goodId) throws UserSystemCouponException, Exception {
+	public void useGoodsCoupon(Long uid, Long id, Long goodId, Integer sourceType) throws UserSystemCouponException, Exception {
 		if (uid == null) {
 			throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
 		}
@@ -654,7 +668,8 @@
 		}
 
 		if (baseCoupon.getType() != CouponTypeEnum.freeCoupon
-				&& baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+				&& baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon
+				&& baseCoupon.getType() != CouponTypeEnum.freeCouponBuy) {
 			throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤");
 		}
 
@@ -668,7 +683,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());
@@ -692,12 +707,16 @@
 
 	@Transactional
 	@Override
-	public void useOrderCoupon(Long uid, Long id, String orderNo) throws UserSystemCouponException, Exception {
+	public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType) 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) {
@@ -732,7 +751,7 @@
 		}
 
 		// 璁㈠崟
-		CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS);
+		CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS, sourceType);
 		if (orderVO == null) {
 			throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
 		}
@@ -746,7 +765,7 @@
 		// 鏉′欢: 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;
 
@@ -768,19 +787,20 @@
 			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,
+			UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(orderNo, sourceType, money,
 					new UserInfo(uid));
 			userMoneyDetailService.addUserMoneyDetail(userMoneyDetail);
 			userInfoService.addMoney(new UserInfo(uid), money);
 
 			// 鎻掑叆璧勯噾閫氱煡
-			userMoneyMsgNotificationService.orderReward(uid, orderNo, money,
+			userMoneyMsgNotificationService.orderReward(uid, orderNo, sourceType, money,
 					userInfoService.selectByPKey(uid).getMyHongBao());
 
 			/* 鐢ㄦ埛鍒镐俊鎭姸鎬佸強璁板綍澶勭悊 */
@@ -795,6 +815,7 @@
 			// 鎻掑叆浣跨敤鍒歌褰�
 			UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
 			couponRecord.setState(UserSystemCouponRecord.STATE_SUCCESS);
+			couponRecord.setGoodSource(sourceType);
 			couponRecord.setOrderNo(orderNo);
 			couponRecord.setUserSystemCoupon(userSystemCoupon);
 			couponRecord.setCouponType(systemCoupon.getType().name());
@@ -813,7 +834,7 @@
 	}
 
 	@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, "璁㈠崟鍙蜂笉瀛樺湪");
@@ -849,7 +870,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, "璁㈠崟淇℃伅鑾峰彇澶辫触");
@@ -891,7 +912,7 @@
 	}
 
 	@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, "璁㈠崟鍙蜂笉瀛樺湪");
@@ -919,7 +940,7 @@
 		}
 
 		// 璁㈠崟
-		CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo, null);
+		CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo, null, sourceType);
 		if (orderVO == null) {
 			throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
 		}
@@ -1107,9 +1128,6 @@
 			return;
 		}
 
-		// 楠岃瘉鏄惁澶辨晥
-		updateCounponInvalid(uid);
-
 		// 寰呮椿绂忓埄鍏嶅崟鍒�
 		List<UserSystemCoupon> list = userSystemCouponMapper.getCouponByTypeAndNotActivated(uid, systemCoupon.getId());
 		if (list == null || list.size() == 0) {
@@ -1191,28 +1209,35 @@
 			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);
 		}
 	}
 
-	@Transactional
 	@Override
-	public void updateCounponInvalid(Long uid) {
-		List<UserSystemCoupon> list = userSystemCouponMapper.getCounponNowInvalid(uid);
+	public List<UserSystemCoupon> getCounponNowInvalid(int count) {
+		return userSystemCouponMapper.getCounponNowInvalid(count);
+	}
+	
+
+	@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 systemCoupon = userSystemCoupon.getSystemCoupon();
-			if (systemCoupon == null) {
+			SystemCoupon baseCoupon = userSystemCoupon.getSystemCoupon();
+			if (baseCoupon == null) {
 				continue;
 			}
-
-			SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+			
+			baseCoupon = systemCouponService.selectByPrimaryKey(baseCoupon.getId());
 			if (baseCoupon == null || baseCoupon.getId() == null) {
 				continue;
 			}
@@ -1225,8 +1250,11 @@
 					userOtherMsgNotificationService.freeSheetCouponAlreadyOutOfDate(userSystemCoupon);
 				} else if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
 					userOtherMsgNotificationService.rewardCouponAlreadyOutOfDate(userSystemCoupon);
+				}else if (baseCoupon.getType() == CouponTypeEnum.freeCouponBuy) {
+					userOtherMsgNotificationService.outOfDate(userSystemCoupon, MsgTypeOtherTypeEnum.freeCouponBuy);
+				} else if (baseCoupon.getType() == CouponTypeEnum.freeCouponGive) {
+					userOtherMsgNotificationService.outOfDate(userSystemCoupon, MsgTypeOtherTypeEnum.freeCouponGive);
 				}
-
 			} catch (Exception e) {
 				try {
 					LogHelper.errorDetailInfo(e);
@@ -1241,7 +1269,7 @@
 	@Override
 	public void sendBackTimeOutCoupon(Long uid) {
 		// 瓒呰繃10鍒嗛挓   鏈鍖归厤鐨勫埜
-		List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid,600L);
+		List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 600L);
 		if (list == null || list.size() == 0) {
 			return;
 		}
@@ -1253,32 +1281,9 @@
 			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);
 		}
@@ -1353,6 +1358,8 @@
 					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);
 				}
 			}
 		}
@@ -1365,42 +1372,50 @@
 	 * 
 	 * @param userSystemCoupon
 	 */
-	public void sendBackCoupon(UserSystemCoupon userSystemCoupon, UserSystemCouponRecord record) throws Exception {
-
-		int expiryDay = 15;
-
-		SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
-		SystemCoupon coupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
-		if (coupon != null) {
-			expiryDay = coupon.getExpiryDay();
+	public void sendBackCoupon(UserSystemCoupon userCoupon, UserSystemCouponRecord record) throws Exception {
+		if (userCoupon == null)
+			return;
+			
+		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);
+			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.updateByPrimaryKey(userSystemCoupon);
-
-		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());
+		
+		// 浣跨敤璁板綍
+		if  (record != null) {
+			UserSystemCouponRecord useRecordUpdate = new UserSystemCouponRecord();
+			useRecordUpdate.setId(record.getId());
+			useRecordUpdate.setState(UserSystemCouponRecord.STATE_WAIT_TIME_OUT);
+			useRecordUpdate.setUpdateTime(new Date());
+			userSystemCouponRecordService.updateByPrimaryKeySelective(useRecordUpdate);
+			
+			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);
+			}
 		}
+		
 	}
 
 	@Override
@@ -1514,132 +1529,6 @@
 
 	}
 	
-	@Override
-	@Transactional
-	public void receivedCoupon(Long uid) throws Exception {
-		
-		List<PushCoupon> list = pushCouponService.listQueryEffective();
-		if (list == null || list.size() == 0) {
-			return;
-		}
-		
-		List<PushCouponRecord> listRecord = pushCouponRecordService.listByUid(uid);
-		
-		for (PushCoupon pushCoupon: list) {
-			
-			boolean receive = false;
-			
-			String uids = pushCoupon.getUids();
-			if (uids == null || uids.trim().length() == 0) {
-				receive = true;
-			} else {
-				String[] uidArray = uids.split(",");
-				
-				if (uidArray != null) {
-					for (int i = 0; i < uidArray.length; i++) {
-						String str_uid = uidArray[i];
-						if (str_uid != null && str_uid.trim().length() > 0) {
-							if(str_uid.equals(uid.toString())) {
-								receive = true;
-							}
-						}
-					}
-				}
-			}
-			
-			if (!receive) {
-				continue;
-			}
-			
-			if (listRecord != null && listRecord.size() > 0) {
-				for (PushCouponRecord PushCouponRecord: listRecord) {
-					 PushCoupon pushCoupon2 = PushCouponRecord.getPushCoupon();
-					
-					if (pushCoupon.getId().equals(pushCoupon2.getId()) ) {
-						receive = false;
-						break;
-					}
-				}
-			}
-			
-			if (receive) {
-				// 鎻掑叆璁板綍
-				PushCouponRecord pushCouponRecord = new PushCouponRecord();
-				pushCouponRecord.setPushCoupon(pushCoupon);
-				pushCouponRecord.setUid(uid);
-				pushCouponRecord.setCreateTime(new Date());
-				pushCouponRecordService.insertSelective(pushCouponRecord);
-				
-				// 鎻掑叆鍒�
-				randomRewardCouponForPush(pushCoupon, uid);
-			}
-		}
-	}
-	
-	@Transactional
-	public void randomRewardCouponForPush(PushCoupon pushCoupon, Long uid) throws Exception {
-		int coupon = 0;
-		
-		Integer amount = pushCoupon.getAmount();
-		for (int i = 0; i < amount; i++) {
-			
-			BigDecimal percent = pushCoupon.getPercent();
-			if (percent == null) {
-				// 杩斿埄姣�-闅忔満
-				percent = new BigDecimal(randomNum());
-			}
-			
-			// 鏌ヨ濂栧姳鍒�
-			SystemCoupon systemCoupon = systemCouponService.getCouponByTypeAndPercent(
-					CouponTypeEnum.rebatePercentCoupon.name(),percent);
-			
-			if (systemCoupon == null) {
-				return;
-			}
-			
-			UserSystemCoupon userCoupon = new UserSystemCoupon();
-			userCoupon.setUid(uid);
-			userCoupon.setSource(UserSystemCoupon.SOURCE_SYSTEM_PUSH);
-			userCoupon.setSystemCoupon(systemCoupon);
-			userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
-			userCoupon.setStateActivated(1);
-			userCoupon.setStartTime(pushCoupon.getStartTime());
-			userCoupon.setEndTime(pushCoupon.getEndTime());
-			userCoupon.setCreateTime(new Date());
-			userCoupon.setUpdateTime(new Date());
-			// 鎻掑叆鏁版嵁搴�
-			insertSelective(userCoupon);
-			
-			// 鍒告暟閲�
-			coupon ++;
-			
-			// 娑堟伅鎺ㄩ��
-			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(coupon);
-		} else {
-			userInfoExtra.setCouponNews(couponNews + coupon);
-		}
-		userInfoExtraService.saveUserInfoExtra(userInfoExtra);
-	}
-	
 	
 	@Override
 	@Transactional
@@ -1712,20 +1601,25 @@
 		int result = 1;
 		
 		List<RandomProportion> list = new ArrayList<RandomProportion>();
-		list.add(new RandomProportion(1,2,30));
-		list.add(new RandomProportion(2,4,25));
-		list.add(new RandomProportion(4,6,20));
-		list.add(new RandomProportion(6,8,6));
-		list.add(new RandomProportion(8,10,6));
-		list.add(new RandomProportion(10,20,6));
-		list.add(new RandomProportion(20,30,2));
-		list.add(new RandomProportion(30,40,2));
-		list.add(new RandomProportion(40,50,2));
-		list.add(new RandomProportion(50,60,1));
+		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() * (99)));
+		int randomNum = (int) (1 + Math.round(Math.random() * (199)));
 		
 		for (int i = 0; i < list.size(); i++) {
 			
@@ -1735,11 +1629,8 @@
 			maxRange = maxRange + probability;
 			minRange = maxRange - probability;
 			
-			if (i == list.size() && randomNum > minRange && randomNum <= maxRange) {
-				result = proportion.minNum + (int) (Math.random() * ((proportion.maxNum - proportion.minNum) + 1));
-				break;
-			} else if(randomNum > minRange && randomNum <= maxRange) {
-				result = proportion.minNum + (int) (Math.random() * ((proportion.maxNum - proportion.minNum)));
+			if(randomNum > minRange && randomNum <= maxRange) {
+				result = proportion.num;
 				break;
 			}
 		}
@@ -1748,17 +1639,518 @@
 	}
 	
 	class RandomProportion {
-		public int minNum;// 鏈�灏�
-		public int maxNum;// 鏈�澶�
+		public int num;//鍒稿��
 		public int probability; // 姒傜巼
 		
 		RandomProportion () {}
 		
-		RandomProportion (int minNum, int maxNum, int probability) {
-			this.minNum = minNum;
-			this.maxNum = maxNum;
+		RandomProportion (int num, int probability) {
+			this.num = num;
 			this.probability = probability;
 		}
 	}
 	
+	
+	@Override
+	@Transactional
+	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");
+		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
+	@Override
+	public List<UserSystemCouponVO> getCouponList(long start, int count, Long uid)
+			throws UserSystemCouponException, Exception {
+		// 閫�鍥炲埜
+		sendBackTimeOutCoupon(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);
+					} 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)) {
+				userCouponVO.setInUseExplain(configService.get("free_coupon_using-help"));
+			}
+
+			// 鏄惁宸茶禒閫�
+			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("free_goods_list"));
+					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);
+
+					// 杩斿埄濂栧姳鍒�- 璺宠浆鑷宠鍗曞埌璐︾晫闈�
+					jumpLink.put("state", "2");
+					jumpBtn = new HashMap<String, Object>();
+					jumpBtn.put("params", jumpLink);
+					jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("orderList"));
+				}
+			} 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("give_free_coupon_tips");
+					tokenType = TokenTypeEnum.freeCoupon;
+				}
+				
+				if (CouponTypeEnum.rebatePercentCoupon == type) {
+					userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
+					tips = configService.get("give_free_coupon_tips");
+					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("app_down_link"));
+							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.setCouponEffect("浠绘��0鍏冭喘");
+					userCouponVO.setCouponRule(systemCoupon.getRemark());
+					if (CouponTypeEnum.freeCouponGive == type) {
+						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
+	@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("give_free_coupon_tips");
+		} else if (type == CouponTypeEnum.rebatePercentCoupon){
+			tokenTypeEnum = TokenTypeEnum.rebatePercentCoupon;
+			tips = configService.get("give_rebate_percent_coupon_tips");
+		} 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("app_down_link"));
+				
+				return createUserCouponVOo(userSystemCoupon, systemCoupon, record, tips);
+			}
+		}
+		
+		
+		Date nowDate = new Date();
+		// 鎻掑叆璧犻�佽褰�
+		UserSystemCouponGiveRecord giveRecord = new UserSystemCouponGiveRecord();
+		giveRecord.setCouponId(id);
+		giveRecord.setGiveUid(uid);
+		giveRecord.setGiveTime(nowDate);
+		giveRecord.setEndTime(DateUtil.plusDayDate(Constant.GIVE_DAYS, nowDate));
+		userSystemCouponGiveRecordService.insertSelective(giveRecord);
+		
+		// 鍒涘缓璁板綍
+		TokenRecord tokenRecord = new TokenRecord();
+		tokenRecord.setUid(uid);
+		tokenRecord.setIdentify(giveRecord.getId()+"");
+		tokenRecord.setType(tokenTypeEnum);
+		tokenRecord.setStartTime(nowDate);
+		tokenRecord.setEndTime(DateUtil.plusDayDate(Constant.TOKEN_DAYS, nowDate));
+		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("app_down_link"));
+		
+		return createUserCouponVOo(userSystemCoupon, systemCoupon, giveRecord, tips);
+	}
+	
+	
+	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;
+	}
+
+	
+	@Override
+	public void sendBackGiveCoupon(List<UserSystemCouponGiveRecord> overdueList) {
+		for (UserSystemCouponGiveRecord record: overdueList) {
+			// 鏇存柊璧犻�佽褰�
+			UserSystemCouponGiveRecord updateRecord = new UserSystemCouponGiveRecord();
+			updateRecord.setId(record.getId());
+			updateRecord.setState(UserSystemCouponGiveRecord.STATE_OVERDUE);
+			userSystemCouponGiveRecordService.updateByPrimaryKeySelective(updateRecord);
+			
+			// 鏇存柊鍒镐俊鎭�
+			Long couponId = record.getCouponId();
+			if (couponId == null) {
+				continue;
+			}
+			
+			// 鍒稿垪琛�
+			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.updateByPrimaryKey(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;
+			
+			String couponName = systemCoupon.getName();
+			if (CouponTypeEnum.freeCouponGive == systemCoupon.getType())
+				couponName = "鍏嶅崟鍒�";
+			
+			// 閫�鍥炴秷鎭�
+			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 countIncludeExchange(Long uid) {
+//		
+//		
+//	}
+//	
+//	
+//	@Override
+//	public boolean countNotIncludeExchange(Long uid) {
+//		
+//		
+//	}
+
 }

--
Gitblit v1.8.0