From b19d2e730b0ea707b500b307f58c46ba0cef695f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 18 九月 2019 18:41:21 +0800
Subject: [PATCH] 抖音广告监测修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 1053 +++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 738 insertions(+), 315 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 1d3dad9..acd520b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -1,7 +1,6 @@
 package com.yeshi.fanli.service.impl.user;
 
 import java.math.BigDecimal;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -11,13 +10,17 @@
 
 import javax.annotation.Resource;
 
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.task.TaskExecutor;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.yeshi.utils.DateUtil;
 
 import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper;
-import com.yeshi.fanli.entity.bus.user.DeviceLotteryRecord;
+import com.yeshi.fanli.dto.msg.MsgOtherCouponActivateDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
+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;
@@ -39,25 +42,24 @@
 import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.SystemCouponService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
-import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
+import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
+import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
 import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;
 import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
 import com.yeshi.fanli.service.inter.order.CommonOrderService;
 import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
+import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
 import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
 import com.yeshi.fanli.service.inter.order.OrderService;
 import com.yeshi.fanli.service.inter.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.service.inter.user.invite.ThreeSaleSerivce;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.RedisManager;
@@ -103,6 +105,7 @@
 	private UserSystemCouponRecordService userSystemCouponRecordService;
 
 	@Resource
+	@Lazy
 	private HongBaoV2Service hongBaoV2Service;
 
 	@Resource
@@ -133,12 +136,10 @@
 	private UserOtherMsgNotificationService userOtherMsgNotificationService;
 
 	@Resource
-	private DeviceLotteryRecordService deviceLotteryRecordService;
-
-	@Resource
 	private CommonOrderCountService commonOrderCountService;
 	
 	@Resource
+	@Lazy
 	private PushCouponService pushCouponService;
 	
 	@Resource
@@ -184,13 +185,18 @@
 	}
 	
 	@Override
+	public long countCouponOld(Long uid) {
+		return userSystemCouponMapper.countCouponOld(uid);
+	}
+	
+	@Override
 	public long countUserCouponList(Long uid) {
 		return userSystemCouponMapper.countUserCouponList(uid);
 	}
 
 	@Override
 	@Transactional
-	public void insertUserCoupon(Long uid, String couponType, String source)
+	public UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent)
 			throws UserSystemCouponException, Exception {
 
 		if (couponType == null || uid == null) {
@@ -198,13 +204,18 @@
 		}
 
 		SystemCoupon coupon = null;
-		if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name()) || couponType.equals(CouponTypeEnum.freeCoupon.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())) {
 			// 闅忔満濂栧姳鍒�
-			randomRewardCoupon(1, uid, source);
-			return;
+			if (percent == null || percent.compareTo(new BigDecimal(0)) < 1) {
+				randomRewardCoupon(1, uid, source);
+				return null;
+			}  else {
+				coupon = systemCouponService.getCouponByTypeAndPercent(couponType, percent);
+			}
 		}
 		
 		if (coupon == null) {
@@ -223,10 +234,20 @@
 			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());
-		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+		String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		if (endDay != null && endDay.trim().length() > 0) {
+			endDay += " 23:59:59";
+		}
 		Date endTime = format.parse(endDay);
 
 		UserSystemCoupon userCoupon = new UserSystemCoupon();
@@ -281,6 +302,8 @@
 				e1.printStackTrace();
 			}
 		}
+		
+		return userCoupon;
 	}
 
 	@Transactional
@@ -292,12 +315,13 @@
 			return null;
 		}
 
-		// 鏇存柊杩囨湡鍒�
-		updateCounponInvalid(uid);
+		// 杩囨湡鍒�
+		updateInvalidSate(uid);
+		
 		// 閫�鍥炲埜
 		sendBackTimeOutCoupon(uid);
 		
-		List<UserSystemCouponVO> listVO = userSystemCouponMapper.getUserCouponVOList(start, count, uid);
+		List<UserSystemCouponVO> listVO = userSystemCouponMapper.getCouponListOld(start, count, uid);
 		if (listVO == null || listVO.size() == 0) {
 			return listVO;
 		}
@@ -473,11 +497,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;
@@ -494,7 +523,6 @@
 					differentDays = 0;
 				}
 			}
-
 			userCouponVO.setCouponTerm(couponTerm);
 
 			// 鍓╀綑澶╂暟
@@ -507,12 +535,9 @@
 				userCouponVO.setState(0);
 				userCouponVO.setCouponEffect("寰呮縺娲�");
 				userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
-
 				remainDaysFontColor = "#CCCCCC";
-
 			} else {
 				userCouponVO.setCouponPicture(systemCoupon.getPicture());
-
 				remainDaysFontColor = "#F14242";
 			}
 
@@ -523,6 +548,7 @@
 		return listVO;
 	}
 
+	
 	/**
 	 * 鏄惁瀛樺湪濂栧姳鍒�
 	 * 
@@ -555,8 +581,9 @@
 			throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
 		}
 
-		// 鏇存柊杩囨湡鍒�
-		updateCounponInvalid(uid);
+		// 杩囨湡鍒�
+		updateInvalidSate(uid);
+		
 		// 閫�鍥炲埜
 		sendBackTimeOutCoupon(uid);
 
@@ -582,8 +609,9 @@
 			throw new UserSystemCouponException(1, "鍟嗗搧ID涓虹┖");
 		}
 
-		// 鏇存柊杩囨湡鍒�
-		updateCounponInvalid(uid);
+		// 杩囨湡鍒�
+		updateInvalidSate(uid);
+		
 		// 閫�鍥炲埜
 		sendBackTimeOutCoupon(uid);
 		
@@ -594,12 +622,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) {
@@ -613,7 +640,6 @@
 							map.put("fontColor", "#CCCCCC");
 						}
 						userCouponVO.setRemainDays(map);
-
 					}
 				}
 			}
@@ -621,7 +647,44 @@
 
 		return list;
 	}
+	
 
+	@Override
+	public long countUsableFreeCouponForBuy (Long uid) {
+		if (uid == null) 
+			return 0;
+		
+		List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
+		if (couponList == null || couponList.size() == 0)
+			return 0;
+		
+		List<Long> listCouponId = new ArrayList<Long>();
+		for (SystemCoupon systemCoupon : couponList) {
+			listCouponId.add(systemCoupon.getId());
+		}
+		
+		return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
+	}
+	
+	
+	@Override
+	public long countUsableRewardCoupon (Long uid) {
+		if (uid == null) 
+			return 0;
+		
+		List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();
+		if (couponList == null || couponList.size() == 0)
+			return 0;
+		
+		List<Long> listCouponId = new ArrayList<Long>();
+		for (SystemCoupon systemCoupon : couponList) {
+			listCouponId.add(systemCoupon.getId());
+		}
+		
+		return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
+	}
+	
+	
 	@Transactional
 	@Override
 	public void useGoodsCoupon(Long uid, Long id, Long goodId, Integer sourceType) throws UserSystemCouponException, Exception {
@@ -661,7 +724,8 @@
 		}
 
 		if (baseCoupon.getType() != CouponTypeEnum.freeCoupon
-				&& baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+				&& baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon
+				&& baseCoupon.getType() != CouponTypeEnum.freeCouponBuy) {
 			throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤");
 		}
 
@@ -885,7 +949,7 @@
 		userRecordVO.setCouponEffect("杩斿埄楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN) + "宸茶繑" + percent + "%");
 
 		// 璧勯噾鏄庣粏
-		JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("capitalDetails");
+		JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("moneyDetails");
 		Map<String, Object> jumpWelfare = new HashMap<String, Object>();
 		jumpWelfare.put("jumpDetail", welfareCore);
 		Map<String, Object> jumpparms = new HashMap<String, Object>();
@@ -1120,9 +1184,6 @@
 			return;
 		}
 
-		// 楠岃瘉鏄惁澶辨晥
-		updateCounponInvalid(uid);
-
 		// 寰呮椿绂忓埄鍏嶅崟鍒�
 		List<UserSystemCoupon> list = userSystemCouponMapper.getCouponByTypeAndNotActivated(uid, systemCoupon.getId());
 		if (list == null || list.size() == 0) {
@@ -1204,99 +1265,17 @@
 			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);
-		if (list == null || list.size() == 0) {
-			return;
-		}
-
-		for (UserSystemCoupon userSystemCoupon : list) {
-			// 鏇存柊鍒稿凡杩囨湡
-			userSystemCoupon.setState(UserSystemCoupon.STATE_OVERDUE);
-			userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
-
-			SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
-			if (systemCoupon == null) {
-				continue;
-			}
-
-			SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
-			if (baseCoupon == null || baseCoupon.getId() == null) {
-				continue;
-			}
-
-			// 娑堟伅鎺ㄩ��
-			try {
-				if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
-					userOtherMsgNotificationService.welfareCouponAlreadyOutOfDate(userSystemCoupon);
-				} else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
-					userOtherMsgNotificationService.freeSheetCouponAlreadyOutOfDate(userSystemCoupon);
-				} else if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
-					userOtherMsgNotificationService.rewardCouponAlreadyOutOfDate(userSystemCoupon);
-				}
-
-			} catch (Exception e) {
-				try {
-					LogHelper.errorDetailInfo(e);
-				} catch (Exception e1) {
-					e1.printStackTrace();
-				}
-			}
-		}
+	public List<UserSystemCoupon> getCounponNowInvalid(int count) {
+		return userSystemCouponMapper.getCounponNowInvalid(count);
 	}
-
-	@Transactional
-	@Override
-	public void sendBackTimeOutCoupon(Long uid) {
-		// 瓒呰繃10鍒嗛挓   鏈鍖归厤鐨勫埜
-		List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid,600L);
-		if (list == null || list.size() == 0) {
-			return;
-		}
-
-		for (UserSystemCouponRecord couponRecord : list) {
-			// 鏇存柊鐘舵�侊細鍖归厤瓒呮椂
-			couponRecord.setState(UserSystemCouponRecord.STATE_WAIT_TIME_OUT);
-			couponRecord.setUpdateTime(new Date());
-			userSystemCouponRecordService.updateByPrimaryKeySelective(couponRecord);
-
-			UserSystemCoupon userSystemCoupon = couponRecord.getUserSystemCoupon();
-
-			int expiryDay = 15;
-
-			SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
-			SystemCoupon coupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
-			if (coupon != null) {
-				expiryDay = coupon.getExpiryDay();
-			}
-
-			// 缁撴潫鏃ユ湡
-			Date endTime = null;
-			try {
-				// 浠婂ぉ鍦ㄥ唴  鍑忓幓涓�澶�
-				String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
-				SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-				endTime = format.parse(endDay);
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-			// 鐘舵�佸垵濮嬪寲
-			userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
-			userSystemCoupon.setUseTime(null);
-
-			// 鏈夋晥鏈熸椂闂撮噸鏂板畾涔�
-			userSystemCoupon.setStartTime(new Date());
-			userSystemCoupon.setEndTime(endTime);
-			userSystemCoupon.setUpdateTime(new Date());
-			userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
-		}
-	}
-
+	
+	
 	@Transactional
 	@Override
 	public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId)
@@ -1366,6 +1345,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);
 				}
 			}
 		}
@@ -1373,157 +1354,84 @@
 		return isfree;
 	}
 
-	/**
-	 * 閫�鍥炲埜 鍒濆鏁版嵁
-	 * 
-	 * @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();
-		}
-
-		// 缁撴潫鏃ユ湡
-		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);
-
-		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());
-		}
-	}
+	
 
 	@Override
 	@Transactional
 	public void copyLotteryPrize(Long uid, int platform, String device) throws Exception {
 
-		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");
-			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);
+		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);
+		 */
 
 	}
 	
@@ -1548,7 +1456,10 @@
 			
 			// 缁撴潫鏃ユ湡 浠婂ぉ鍦ㄥ唴  鍑忓幓涓�澶�
 			String endDay = DateUtil.plusDay(systemCoupon.getExpiryDay() - 1, new Date());
-			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+			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();
@@ -1673,10 +1584,22 @@
 		} 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(coupon.getExpiryDay() - 1, new Date());
-		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+		String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		if (endDay != null && endDay.trim().length() > 0) {
+			endDay += " 23:59:59";
+		}
 		Date endTime = format.parse(endDay);
 
 		UserSystemCoupon userCoupon = new UserSystemCoupon();
@@ -1699,11 +1622,17 @@
 	@Override
 	public List<UserSystemCouponVO> getCouponList(long start, int count, Long uid)
 			throws UserSystemCouponException, Exception {
-		// 鏇存柊杩囨湡鍒�
-		updateCounponInvalid(uid);
+	
+		// 杩囨湡鍒�
+		updateInvalidSate(uid);
+		
 		// 閫�鍥炲埜
 		sendBackTimeOutCoupon(uid);
-
+		
+		// 璧犻�佺殑閫�鍥�
+		sendBackGiveUser(uid);
+		
+		
 		List<UserSystemCouponVO> listVO = userSystemCouponMapper.getUserCouponVOList(start, count, uid);
 		if (listVO == null || listVO.size() == 0) {
 			return listVO;
@@ -1726,7 +1655,12 @@
 				continue; // 鍒镐俊鎭笉瀹屾暣
 			}
 
-			userCouponVO.setSource("鏉ユ簮锛�" + userCouponVO.getSource());
+			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());
@@ -1748,7 +1682,7 @@
 				userCouponVO.setCouponPicture(systemCoupon.getPicture());
 			}
 
-			if (UserSystemCoupon.STATE_CAN_USE == state) {
+			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");
@@ -1782,6 +1716,15 @@
 						listTip.add("婊¤冻鏉′欢鍚庯紝绯荤粺灏嗚嚜鍔ㄦ縺娲伙紝骞跺湪娑堟伅-鍏跺畠娑堟伅涓彁閱掋��");
 						userCouponVO.setTips(listTip);
 						userCouponVO.setPopup(true);
+						
+						// 楠岃瘉鏄惁宸茬疮璁�3鍗�
+						executor.execute(new Runnable() {
+							@Override
+							public void run() {
+								freeCouponActivate(userCouponVO.getId(), uid, userCouponVO.getCreateTime());
+							}
+						});
+						
 					} else if (CouponTypeEnum.welfareFreeCoupon == type) {
 						jumpBtn = new HashMap<String, Object>();
 						if (inviteCode != null && inviteCode.trim().length() > 0) {
@@ -1795,7 +1738,11 @@
 
 			if (UserSystemCoupon.STATE_IN_USE == state && (CouponTypeEnum.freeCouponBuy == type
 					|| CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type)) {
-				userCouponVO.setInUseExplain(configService.get("free_coupon_using-help"));
+				List<String> listTip = new ArrayList<String>();
+				listTip.add("绯荤粺姝e湪鍒ゆ柇鏄惁绗﹀悎鍏嶅崟闇�姹傦紱");
+				listTip.add("绯荤粺姝e湪鍚屾娣樺疂璁㈠崟锛�");
+				listTip.add("鏈娇鐢ㄦ垚鍔熺殑鍏嶅崟鍒镐細鍘熻矾閫�鍥炪��");
+				userCouponVO.setTipsUsing(listTip);
 			}
 
 			// 鏄惁宸茶禒閫�
@@ -1803,6 +1750,8 @@
 			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>();
@@ -1818,50 +1767,96 @@
 					// 鍙娇鐢ㄣ�� 鍙禒閫�
 					userCouponVO.setState(UserSystemCoupon.STATE_USE_GIVE);
 
-					// 杩斿埄濂栧姳鍒�- 璺宠浆鑷宠鍗曞埌璐︾晫闈�
-					jumpLink.put("state", "2");
+					// 璁㈠崟鍒楄〃
+					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("orderList"));
+					jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("order_screen_list"));
 				}
 			} else if (UserSystemCoupon.STATE_IN_USE == state && give) {
 				userCouponVO.setCouponEffect("璧犻�佷腑");
+				userCouponVO.setCouponRule(systemCoupon.getRemark());
 				String tips = null;
+				
+				TokenTypeEnum tokenType = null;
 				if (CouponTypeEnum.freeCouponGive == type) {
 					userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
 					tips = configService.get("give_free_coupon_tips");
+					tokenType = TokenTypeEnum.freeCoupon;
 				}
 				
 				if (CouponTypeEnum.rebatePercentCoupon == type) {
 					userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
-					tips = configService.get("give_free_coupon_tips");
+					tips = configService.get("give_rebate_percent_coupon_tips");
+					tokenType = TokenTypeEnum.rebatePercentCoupon;
 				}
 				
-				if (!StringUtil.isNullOrEmpty(tips)) {
+				if (!StringUtil.isNullOrEmpty(tips) && tokenType != null) {
 					UserSystemCouponGiveRecord record = userSystemCouponGiveRecordService.getRecordByUidAndCouponId(uid, userCouponVO.getId());
 					if (record != null) {
-						TokenRecord tokenRecord = tokenRecordService.getNearByTypeAndIdentify(CouponTypeEnum.freeCoupon.name(), record.getId().toString());
+						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.setCouponRule(systemCoupon.getRemark());
+					if (CouponTypeEnum.freeCouponGive == type) {
+						userCouponVO.setCouponEffect("浠绘��0鍏冭喘");
+						userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);
+					}
+					
+					if (CouponTypeEnum.rebatePercentCoupon == type) {
+						userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);
+					}
+					
+					Date useTime = userCouponVO.getUseTime();
+					if (useTime != null) {
+						Map<String, Object> remainDays = new HashMap<String, Object>();
+						remainDays.put("content", "浜�" + sdf.format(useTime) + "璧犻��");
+						remainDays.put("fontColor", "#CCCCCC");
+						userCouponVO.setRemainDays(remainDays);
 					}
 				} else {
-					tips = "";
-				}
-				userCouponVO.setGiveTips(tips);
-				
-			} else if (UserSystemCoupon.STATE_END_USE == state) {
-				if (give && CouponTypeEnum.freeCouponGive == 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);
+					}
 				}
 				
-				if (give && CouponTypeEnum.rebatePercentCoupon == type) {
-					userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);
+			}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);
 		}
@@ -1871,7 +1866,7 @@
 	
 	@Transactional
 	@Override
-	public String giveCoupon(Long uid, Long id) throws UserSystemCouponException {
+	public UserSystemCouponVO giveCoupon(Long uid, Long id) throws UserSystemCouponException {
 		UserSystemCoupon userSystemCoupon = userSystemCouponMapper.selectByPrimaryKey(id);
 		if (userSystemCoupon == null)
 			throw new UserSystemCouponException(1, "璇ュ埜宸蹭笉瀛樺湪");
@@ -1885,11 +1880,8 @@
 			throw new UserSystemCouponException(1, "璇ュ埜宸插け鏁�");
 		
 		Integer state = userSystemCoupon.getState();
-		if (state == UserSystemCoupon.STATE_OVERDUE) 
-			throw new UserSystemCouponException(1, "璇ュ埜宸茶繃鏈�");
-		
-		if (state == UserSystemCoupon.STATE_END_USE) 
-			throw new UserSystemCouponException(1, "璇ュ埜浣跨敤/璧犻�佹垚鍔�");
+		if (state != UserSystemCoupon.STATE_CAN_USE) 
+			throw new UserSystemCouponException(1, "璇ュ埜宸茶浣跨敤鎴栬禒閫�");
 		
 		CouponTypeEnum type = systemCoupon.getType();
 		if (type != CouponTypeEnum.freeCouponGive && type != CouponTypeEnum.rebatePercentCoupon )
@@ -1921,7 +1913,8 @@
 					tips = tips.replace("{APP鍚嶇О}", projectChineseName);
 				}
 				tips = tips.replace("{鍙d护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"));
-				return tips;
+				
+				return createUserCouponVOo(userSystemCoupon, systemCoupon, record, tips);
 			}
 		}
 		
@@ -1970,34 +1963,464 @@
 			tips = tips.replace("{APP鍚嶇О}", projectChineseName);
 		}
 		tips = tips.replace("{鍙d护}", token).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"));
-		return tips;
+		
+		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 sendBackGive(Long id) {
-		UserSystemCoupon userSystemCoupon = userSystemCouponMapper.selectByPrimaryKey(id);
-		if (userSystemCoupon == null)
-			return;
+	/**
+	 * 鍏嶅崟鍒告縺娲�
+	 * @param uid
+	 */
+	public void freeCouponActivate(Long id,Long uid, Date date) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		long count = commonOrderCountService.countValidOrderByDate(uid, sdf.format(date));
 		
-		Integer state = userSystemCoupon.getState();
+		String activateNum = configService.get("free_coupon_activate_num");
+		int num = Integer.parseInt(activateNum);
+		
+		if (count >= num) {
+			UserSystemCoupon coupon = userSystemCouponMapper.selectByPrimaryKey(id);
+			if (coupon == null || coupon.getState() != UserSystemCoupon.STATE_CAN_USE
+					|| coupon.getStateActivated() != 0)
+				return;
+			
+			Date nowDate = new Date();
+			Date endTime2 = coupon.getEndTime();
+			if (endTime2 != null && endTime2.getTime() <= nowDate.getTime())
+				return;
+			
+			
+			SystemCoupon systemCoupon = coupon.getSystemCoupon();
+			if (systemCoupon == null)
+				return;
+			
+			systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+			if (systemCoupon == null || systemCoupon.getType() != CouponTypeEnum.freeCoupon)
+				return;
+			
+
+			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";
+				}
+				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);
+				
+				// 璧犻�佽褰�
+				UserSystemCouponGiveRecord giveRecord = userSystemCouponGiveRecordService.getByReceiveId(id);
+				if (giveRecord == null) 
+					return;
+				
+				Long giveUid = giveRecord.getGiveUid();
+				UserInfo userInfo = userInfoService.selectByPKey(giveUid);
+				if (userInfo == null) 
+					return;
+				
+				String beiZhu = "璇峰埌鎴戠殑-绂忓埄涓績涓煡鐪�";
+				SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+				MsgOtherCouponActivateDTO msgOther = new MsgOtherCouponActivateDTO();
+				msgOther.setTitle("鍏嶅崟鍒告縺娲�");
+				msgOther.setType("鍏嶅崟鍒哥郴缁熷凡鑷姩婵�娲�");
+				msgOther.setExplain("婊¤冻"+ systemCoupon.getActivateDay() +"澶╁唴浜х敓"+ num +"绗斿凡鍒拌处杩斿埄璁㈠崟");
+				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);
+			}
+		}
+	}
+	
+	
+	@Transactional
+	@Override
+	public void updateInvalidSate(Long uid) {
+		List<UserSystemCoupon> list = userSystemCouponMapper.getCounponNowInvalidByUid(uid);
+		if (list == null || list.size() == 0) {
+			return;
+		}
+		updateCounponInvalid(list);
+	}
+	
+	
+	@Override
+	public void updateCounponInvalid(List<UserSystemCoupon> list) {
+		if (list == null || list.size() == 0) {
+			return;
+		}
+
+		for (UserSystemCoupon userSystemCoupon : list) {
+			UserSystemCoupon userCoupon = new UserSystemCoupon();
+			userCoupon.setUpdateTime(new Date());
+			userSystemCoupon.setState(UserSystemCoupon.STATE_OVERDUE);
+			userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+
+			SystemCoupon baseCoupon = userSystemCoupon.getSystemCoupon();
+			if (baseCoupon == null) {
+				continue;
+			}
+			
+			baseCoupon = systemCouponService.selectByPrimaryKey(baseCoupon.getId());
+			if (baseCoupon == null || baseCoupon.getId() == null) {
+				continue;
+			}
+
+			// 娑堟伅鎺ㄩ��
+			try {
+				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);
+				} else if (baseCoupon.getType() == CouponTypeEnum.freeCouponGive) {
+					userOtherMsgNotificationService.outOfDate(userSystemCoupon, MsgTypeOtherTypeEnum.freeCouponGive);
+				}
+			} catch (Exception e) {
+				try {
+					LogHelper.errorDetailInfo(e);
+				} catch (Exception e1) {
+					e1.printStackTrace();
+				}
+			}
+		}
+	}
+	
+	
+	/**
+	 * 閫�鍥炲埜 鍒濆鏁版嵁
+	 * 
+	 * @param userSystemCoupon
+	 */
+	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 = userSystemCoupon.getEndTime();
+		Date endTime = userCoupon.getEndTime();
 		if (endTime != null && endTime.getTime() < now.getTime()) {
-			
-			// TODO 杩囨湡
+			// 杩囨湡
+			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.updateByPrimaryKey(userSystemCoupon);
+		userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+		
+		// 浣跨敤璁板綍
+		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);
+			}
+		}
+	}
+	
+	
+	@Async()
+	@Transactional
+	@Override
+	public void sendBackTimeOutCoupon(Long uid) {
+		// 鍟嗗搧鐩稿叧鐨勫埜
+		List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
+		if (couponList == null || couponList.size() == 0) {
+			return;
+		}
 
-		// TODO 娑堟伅
+		List<Long> list = new ArrayList<Long>();
+		for (SystemCoupon systemCoupon: couponList) {
+			list.add(systemCoupon.getId());
+		}
+		
+		// 瓒呰繃10鍒嗛挓   鏈鍖归厤鐨勫厤鍗曞埜
+		List<UserSystemCoupon> listUserCoupon = userSystemCouponMapper.getCouponByUsingTimeOut(uid, list, 600L);
+		if (listUserCoupon == null || listUserCoupon.size() == 0) {
+			return;
+		}
+
+		for (UserSystemCoupon userCoupon : listUserCoupon) {
+			// 鐘舵�佸垵濮嬪寲
+			UserSystemCoupon userSystemCoupon = new UserSystemCoupon();
+			userSystemCoupon.setId(userCoupon.getId());
+			userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+			userSystemCoupon.setUseTime(null);
+			userSystemCoupon.setUpdateTime(new Date());
+			userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+			
+			UserSystemCouponRecord record = userSystemCouponRecordService.getNearByUserCouponId(userCoupon.getId());
+			if (record != null) {
+				UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
+				couponRecord.setId(record.getId());
+				couponRecord.setUpdateTime(new Date());
+				couponRecord.setState(UserSystemCouponRecord.STATE_WAIT_TIME_OUT);
+				userSystemCouponRecordService.updateByPrimaryKeySelective(couponRecord);
+			}
+		}
+	}
+
+	
+	@Transactional
+	@Override
+	public void sendBackGiveUser(Long uid) {
+		List<UserSystemCouponGiveRecord> list =userSystemCouponGiveRecordService.overdueListByUser(uid);
+		if (list == null || list.size() == 0) {
+			return;
+		}
+		sendBackGiveCoupon(list);
+	}
+	
+	@Override
+	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.updateByPrimaryKeySelective(userSystemCoupon);
+			
+			// 浣跨敤璁板綍
+			UserSystemCouponRecord useRecord = userSystemCouponRecordService.getNearByUserCouponId(couponId);
+			if  (useRecord != null) {
+				UserSystemCouponRecord useRecordUpdate = new UserSystemCouponRecord();
+				useRecordUpdate.setId(useRecord.getId());
+				useRecordUpdate.setState(UserSystemCouponRecord.STATE_WAIT_TIME_OUT);
+				useRecordUpdate.setUpdateTime(new Date());
+				userSystemCouponRecordService.updateByPrimaryKeySelective(useRecordUpdate);
+			}
+			
+			SystemCoupon systemCoupon = userCoupon.getSystemCoupon();
+			if (systemCoupon != null) 
+				systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+			
+			if (systemCoupon == null)
+				continue;
+			
+			
+			// 閫�鍥炴秷鎭�
+			String couponName = systemCoupon.getName();
+			if (CouponTypeEnum.freeCouponGive == systemCoupon.getType()) {
+				couponName = "鍏嶅崟鍒�";
+			} else if (CouponTypeEnum.rebatePercentCoupon == 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 getIncludeExchange(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), 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;
+	}
+
+	
+	@Override
+	public List<UserSystemCouponVO> listIncludeNotExchange(Long uid) throws Exception{
+		// 杩囨湡鍒�
+		updateInvalidSate(uid);
+		
+		// 閫�鍥炲埜
+		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());
+		if (listCoupon == null || listCoupon.size() == 0)
+			return null;
+
+		for (UserSystemCouponVO userCouponVO : listCoupon) {
+			String source = userCouponVO.getSource();
+			if (source != null && "濂栧姳鍒稿ぉ澶╂娊".equals(source)) {
+				source = "澶╁ぉ鎶�";
+			}
+			
+			SystemCoupon systemCoupon = userCouponVO.getSystemCoupon();
+			if (systemCoupon == null) {
+				continue; // 鍒镐俊鎭笉瀹屾暣
+			}
+
+			systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+			
+			userCouponVO.setSource("鏉ユ簮锛�" + source);
+			userCouponVO.setCouponName(systemCoupon.getName());
+			userCouponVO.setCouponEffect(systemCoupon.getEffect());
+			userCouponVO.setCouponRule(systemCoupon.getRule());
+			userCouponVO.setCouponRuleLink(systemCoupon.getRuleLink());
+			userCouponVO.setCouponPicture(systemCoupon.getPicture());
+			userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());
+
+			int differentDays = 0;
+			String couponTerm = "鏈夋晥鏈燂細";
+			Date startTime = userCouponVO.getStartTime();
+			Date endTime = userCouponVO.getEndTime();
+			if (endTime != null && startTime != null) {
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+				couponTerm = couponTerm + sdf.format(startTime) + "-" + sdf.format(endTime);
+
+				SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+				differentDays = DateUtil.daysBetween(sdf2.format(new Date()), sdf2.format(endTime)) + 1;
+				if (differentDays < 0) {
+					differentDays = 0;
+				}
+			}
+			userCouponVO.setCouponTerm(couponTerm);
+
+			// 鍓╀綑澶╂暟
+			Map<String, Object> remainDays = new HashMap<String, Object>();
+			remainDays.put("content", "杩樺墿" + differentDays + "澶╄繃鏈�");
+			String remainDaysFontColor = "";
+
+			Integer stateActivated = userCouponVO.getStateActivated();
+			if (stateActivated == null || stateActivated == 0) {
+				userCouponVO.setState(0);
+				userCouponVO.setCouponEffect("寰呮縺娲�");
+				userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
+				remainDaysFontColor = "#CCCCCC";
+			} else {
+				userCouponVO.setCouponPicture(systemCoupon.getPicture());
+				remainDaysFontColor = "#F14242";
+			}
+
+			remainDays.put("fontColor", remainDaysFontColor);
+			userCouponVO.setRemainDays(remainDays);
+		}
+
+		return listCoupon;
+	}
+	
+	
+	@Override
+	public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type) {
+		return userSystemCouponMapper.getFreeCouponByType(uid, type);
 	}
 }

--
Gitblit v1.8.0