fanli-server.git

			@@ -17,6 +17,7 @@
			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.entity.bus.user.HongBaoV2;
			import com.yeshi.fanli.entity.bus.user.Order;
			import com.yeshi.fanli.entity.bus.user.UserInfo;
			@@ -28,6 +29,7 @@
			import com.yeshi.fanli.entity.order.CommonOrder;
			import com.yeshi.fanli.entity.system.SystemCoupon;
			import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
			import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
			import com.yeshi.fanli.exception.user.UserInfoExtraException;
			import com.yeshi.fanli.exception.user.UserSystemCouponException;
			import com.yeshi.fanli.log.LogHelper;
			@@ -38,10 +40,14 @@
			import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
			import com.yeshi.fanli.service.inter.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.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.UserInfoExtraService;
			import com.yeshi.fanli.service.inter.user.UserInfoService;
			import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
			@@ -49,7 +55,9 @@
			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.factory.UserMoneyDetailFactory;
			import com.yeshi.fanli.util.taobao.TaoBaoUtil;
			import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
			import com.yeshi.fanli.vo.order.CommonOrderVO;
			import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;
			@@ -62,7 +70,10 @@

			@Resource(name = "taskExecutor")
			private TaskExecutor executor;


			@Resource
			private RedisManager redisManager;

			@Resource
			private UserSystemCouponMapper userSystemCouponMapper;

			@@ -101,20 +112,29 @@

			@Resource
			private UserMoneyMsgNotificationService userMoneyMsgNotificationService;


			@Resource
			private UserInfoExtraService userInfoExtraService;


			@Resource
			private ThreeSaleSerivce threeSaleSerivce;


			@Resource
			private UserOtherMsgNotificationService userOtherMsgNotificationService;

			@Resource
			private DeviceLotteryRecordService deviceLotteryRecordService;

			@Resource
			private CommonOrderCountService commonOrderCountService;


			// 券失效图片
			public final static String PIC_INVALID = "http://192.168.1.200/icon/mian_invalid.png";

			@Resource
			private PushCouponService pushCouponService;

			@Resource
			private PushCouponRecordService pushCouponRecordService;


			@Override
			public int insertSelective(UserSystemCoupon record) {
			return userSystemCouponMapper.insertSelective(record);
			@@ -146,22 +166,38 @@
			}

			@Override
			public int countTodatyUserCouponBySource(Long uid, String source) {
			return userSystemCouponMapper.countTodatyUserCouponBySource(uid, source);
			}

			@Override
			public long countUserCouponList(Long uid) {
			return userSystemCouponMapper.countUserCouponList(uid);
			}

			@Override
			public void insertUserCoupon(Long uid, String couponType,String source)throws UserSystemCouponException,Exception{

			@Transactional
			public void insertUserCoupon(Long uid, String couponType, String source)
			throws UserSystemCouponException, Exception {

			if (couponType == null \|\| uid == null) {
			throw new UserSystemCouponException(1, "参数不正确");
			}
			}

			SystemCoupon coupon = null;
			if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name())) {
			// 福利免单券
			coupon = systemCouponService.getCouponByType(couponType);
			} else if (couponType.equals(CouponTypeEnum.rebatePercentCoupon.name())) {
			// 随机奖励券
			randomRewardCoupon(1, uid, source);
			return;
			}

			SystemCoupon coupon= systemCouponService.getCouponByType(couponType);
			if (coupon == null) {
			throw new UserSystemCouponException(1, "券类型不正确");
			}

			}

			int stateActivated = 1;
			if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
			// 福利券状态
			@@ -171,12 +207,13 @@
			stateActivated = 0;
			}
			}


			// 结束日期
			String endDay = DateUtil.plusDay(coupon.getExpiryDay(), new Date());
			// 今天在内减去一天
			String endDay = DateUtil.plusDay(coupon.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(source);
			@@ -189,35 +226,40 @@
			userCoupon.setUpdateTime(new Date());
			// 插入数据库
			insertSelective(userCoupon);


			executor.execute(new Runnable() {
			@Override
			public void run() {
			UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
			// 添加一条消息
			if (userInfoExtra != null) {
			userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1);
			if (userInfoExtra.getCouponNews() == null) {
			userInfoExtra.setCouponNews(1);
			} else {
			userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1);
			}

			try {
			userInfoExtraService.saveUserInfoExtra(userInfoExtra);
			} catch (UserInfoExtraException e) {
			e.printStackTrace();
			}
			}


			}
			});


			// 消息推送
			try {
			if (coupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
			if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
			userOtherMsgNotificationService.welfareCouponGet(userCoupon);
			} else if (coupon.getType() != CouponTypeEnum.freeCoupon) {
			} else if (coupon.getType() == CouponTypeEnum.freeCoupon) {
			userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);
			} else if (coupon.getType() != CouponTypeEnum.rebatePercentCoupon) {
			userOtherMsgNotificationService.rewardCouponGet(userCoupon);
			} else if (coupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
			userOtherMsgNotificationService.rewardCouponGet(userCoupon, coupon.getPercent().intValue());
			}

			} catch(Exception e) {

			} catch (Exception e) {
			try {
			LogHelper.errorDetailInfo(e);
			} catch (Exception e1) {
			@@ -226,16 +268,15 @@
			}
			}



			@Transactional
			@Override
			public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid)
			public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid, boolean changeJump)
			throws UserSystemCouponException, Exception {

			if (uid == null) {
			return null;
			}


			// 更新过期券
			updateCounponInvalid(uid);
			// 退回券
			@@ -247,7 +288,7 @@
			}

			// 数据组织
			listDataFactory(listVO, uid);
			listDataFactory(listVO, uid, changeJump);

			return listVO;
			}
			@@ -257,8 +298,14 @@
			*
			* @param listVO
			*/
			public void listDataFactory(List<UserSystemCouponVO> listVO, Long uid) throws Exception{
			public void listDataFactory(List<UserSystemCouponVO> listVO, Long uid, boolean changeJump) throws Exception {

			String inviteCode = null;
			UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
			if (userInfoExtra != null) {
			inviteCode = userInfoExtra.getInviteCode();
			}

			for (UserSystemCouponVO userCouponVO : listVO) {

			SystemCoupon systemCoupon = userCouponVO.getSystemCoupon();
			@@ -277,43 +324,43 @@
			userCouponVO.setCouponPicture(systemCoupon.getPicture());
			userCouponVO.setCouponEffect(systemCoupon.getEffect());
			userCouponVO.setCouponRule(systemCoupon.getRule());
			userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());

			// 使用状态
			Integer state = userCouponVO.getState();

			// 券类型
			CouponTypeEnum type = systemCoupon.getType();

			// 按钮跳转
			Map<String, Object> jumpBtn = null;


			Integer stateActivated = userCouponVO.getStateActivated();


			if (stateActivated == null \|\| stateActivated == 0) {
			// 显示规则
			userCouponVO.setCouponRule(systemCoupon.getRemark());
			userCouponVO.setCouponEffect("待激活");

			// 状态未激活 -且未被使用
			if (UserSystemCoupon.STATE_CAN_USE == state) {
			userCouponVO.setState(0);
			}

			jumpBtn = new HashMap<String, Object>();
			Map<String, Object> jumpLink = new HashMap<String, Object>();

			UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

			// 邀请队员界面
			if (userInfoExtra != null && userInfoExtra.getInviteCode() != null
			&& userInfoExtra.getInviteCode().trim().length() > 0) {
			// 邀请激活成功界面
			jumpLink.put("url", configService.get("invite_activation_success_url") + "?alert=true");
			// 福利券需要激活界面
			if (!changeJump) {
			jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));
			} else {
			// 激活邀请码界面
			jumpLink.put("url", configService.get("invite_activation_url"));
			if (inviteCode != null && inviteCode.trim().length() > 0) {
			// 邀请好友界面
			jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_friends"));
			} else {
			// 邀请激活界面
			jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_activate"));
			}
			}

			jumpBtn.put("params", jumpLink);
			jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_web"));

			} else if (stateActivated == 1) {
			// 显示规则
			userCouponVO.setCouponRule(systemCoupon.getRule());
			@@ -321,10 +368,9 @@
			if (UserSystemCoupon.STATE_CAN_USE == state) {
			Map<String, Object> jumpLink = new HashMap<String, Object>();

			CouponTypeEnum type = systemCoupon.getType();
			if (CouponTypeEnum.freeCoupon == type \|\| CouponTypeEnum.welfareFreeCoupon == type) {
			// 免单券、福利免单券


			// 免单商品列表
			jumpLink.put("url", configService.get("free_goods_list"));

			@@ -334,25 +380,25 @@

			} else if (CouponTypeEnum.rebatePercentCoupon == type) {
			// 返利奖励券- 跳转至订单到账界面
			jumpLink.put("state", 2);

			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) {
			// 使用中
			userCouponVO.setInUseExplain(configService.get("free_coupon_using-help"));
			}
			}


			// 券失效图片替换
			if (UserSystemCoupon.STATE_END_USE == state \|\| UserSystemCoupon.STATE_OVERDUE == state) {
			userCouponVO.setCouponPicture(PIC_INVALID);
			userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
			}


			userCouponVO.setJumpBtn(jumpBtn);

			String couponTerm = "有效期：";
			@@ -417,14 +463,7 @@
			userCouponVO.setCouponName(systemCoupon.getName());
			userCouponVO.setCouponEffect(systemCoupon.getEffect());
			userCouponVO.setCouponRule(systemCoupon.getRule());

			Integer stateActivated = userCouponVO.getStateActivated();
			if (stateActivated == null \|\| stateActivated == 0) {
			userCouponVO.setCouponPicture(PIC_INVALID); // 未激活
			userCouponVO.setState(0);
			} else {
			userCouponVO.setCouponPicture(systemCoupon.getPicture());
			}
			userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());

			int differentDays = 0;
			String couponTerm = "有效期：";
			@@ -433,7 +472,7 @@
			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) {
			@@ -446,7 +485,23 @@
			// 剩余天数
			Map<String, Object> remainDays = new HashMap<String, Object>();
			remainDays.put("content", "还剩" + differentDays + "天过期");
			remainDays.put("fontColor", "#F14242");
			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);
			}

			@@ -477,17 +532,19 @@
			return hasCoupon;
			}

			@Transactional
			@Override
			public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {

			if (uid == null) {
			throw new UserSystemCouponException(1, "用户未登录");
			}


			// 更新过期券
			updateCounponInvalid(uid);
			// 退回券
			sendBackTimeOutCoupon(uid);


			// 订单相关的券
			List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();
			if (couponList == null \|\| couponList.size() == 0) {
			@@ -497,12 +554,19 @@
			return getEnableListByCouponId(uid, 1, couponList);
			}

			@Transactional
			@Override
			public List<UserSystemCouponVO> getGoodsCouponList(Long uid) throws UserSystemCouponException, Exception {
			public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId)
			throws UserSystemCouponException, Exception {

			if (uid == null) {
			throw new UserSystemCouponException(1, "用户未登录");
			}


			if (auctionId == null) {
			throw new UserSystemCouponException(1, "商品ID为空");
			}

			// 更新过期券
			updateCounponInvalid(uid);
			// 退回券
			@@ -514,9 +578,36 @@
			return null;
			}

			return getEnableListByCouponId(uid, null, couponList);
			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) {
			for (UserSystemCouponVO userCouponVO : list) {
			// 显示不能使用
			userCouponVO.setState(0);
			userCouponVO.setCouponPicture(userCouponVO.getCouponPictureInvalid());

			Map<String, Object> map = userCouponVO.getRemainDays();
			if (map != null) {
			map.put("fontColor", "#CCCCCC");
			}
			userCouponVO.setRemainDays(map);

			}
			}
			}
			}

			return list;
			}

			@Transactional
			@Override
			public void useGoodsCoupon(Long uid, Long id, Long goodId) throws UserSystemCouponException, Exception {
			if (uid == null) {
			@@ -530,6 +621,16 @@
			UserSystemCoupon userSystemCoupon = selectByPrimaryKey(id);
			if (userSystemCoupon == null) {
			throw new UserSystemCouponException(1, "券数据不正确");
			}

			if (userSystemCoupon.getUid().longValue() != uid) {
			throw new UserSystemCouponException(1, "不属于该用户的券");
			}

			Integer state = userSystemCoupon.getState();
			Integer stateActivated = userSystemCoupon.getStateActivated();
			if (UserSystemCoupon.STATE_CAN_USE != state \|\| 1 != stateActivated) {
			throw new UserSystemCouponException(1, "该券不能被使用");
			}

			Long couponUid = userSystemCoupon.getUid();
			@@ -548,7 +649,7 @@
			&& baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
			throw new UserSystemCouponException(1, "券类型不匹配");
			}


			Date date = new Date();
			// 更新券使用
			userSystemCoupon.setState(UserSystemCoupon.STATE_IN_USE); // 正在匹配
			@@ -566,19 +667,19 @@
			couponRecord.setCreateTime(date);
			couponRecord.setUpdateTime(date);
			userSystemCouponRecordService.insertSelective(couponRecord);


			// 消息推送
			try {
			if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
			userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon);
			} else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
			userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
			if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
			// userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order.get);
			} else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
			// userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
			}

			} catch(Exception e) {

			} catch (Exception e) {
			LogHelper.errorDetailInfo(e);
			}


			}

			@Transactional
			@@ -595,6 +696,16 @@
			throw new UserSystemCouponException(1, "券信息不存在");
			}

			if (userSystemCoupon.getUid().longValue() != uid) {
			throw new UserSystemCouponException(1, "不属于该用户的券");
			}

			Integer state = userSystemCoupon.getState();
			Integer stateActivated = userSystemCoupon.getStateActivated();
			if (UserSystemCoupon.STATE_CAN_USE != state \|\| 1 != stateActivated) {
			throw new UserSystemCouponException(1, "该券不能被使用");
			}

			// 系统券信息
			SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
			if (systemCoupon != null && systemCoupon.getId() != null) {
			@@ -608,7 +719,6 @@
			throw new UserSystemCouponException(1, "券类型不匹配");
			}


			if (orderNo == null \|\| orderNo.trim().length() == 0) {
			throw new UserSystemCouponException(1, "订单号不存在");
			}
			@@ -618,7 +728,6 @@
			if (orderVO == null) {
			throw new UserSystemCouponException(1, "订单信息获取失败");
			}


			BigDecimal hongBao = orderVO.getHongBao();
			// 红包状态
			@@ -684,11 +793,11 @@
			couponRecord.setCreateTime(date);
			couponRecord.setUpdateTime(date);
			userSystemCouponRecordService.insertSelective(couponRecord);


			// 消息推送
			try {
			userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon);
			} catch(Exception e) {
			userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon, hongBao, money, orderNo);
			} catch (Exception e) {
			LogHelper.errorDetailInfo(e);
			}
			}
			@@ -730,17 +839,17 @@
			}

			Long uid = userSystemCoupon.getUid();

			CommonOrderVO commonOrderVO= commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(),
			orderNo, CommonOrder.STATE_JS);


			CommonOrderVO commonOrderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo,
			CommonOrder.STATE_JS);

			if (commonOrderVO == null) {
			throw new UserSystemCouponException(1, "订单信息获取失败");
			}


			// 获取奖励金额
			BigDecimal couponMoney = orderHongBaoMapService.getCouponHongbaoByOrderNo(orderNo, uid);


			UserSystemCouponRecordVO userRecordVO = new UserSystemCouponRecordVO();
			userRecordVO.setCouponMoneyState("已到账");
			userRecordVO.setCommonOrder(commonOrderVO);
			@@ -754,8 +863,8 @@
			}
			userRecordVO.setCouponEffect("返利¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN) + "已返" + percent + "%");

			// 跳转福利中心
			JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("welfareCore");
			// 资金明细
			JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("capitalDetails");
			Map<String, Object> jumpWelfare = new HashMap<String, Object>();
			jumpWelfare.put("jumpDetail", welfareCore);
			Map<String, Object> jumpparms = new HashMap<String, Object>();
			@@ -822,7 +931,7 @@
			String progressMsg = "";
			String progressColor = "";
			// 跳转奖励券规则
			userRecordVO.setRuleLink(configService.get("reward_coupon_help"));
			userRecordVO.setRuleLink(configService.get("free_coupon_help"));

			// 进度： 1 灰色 2 红色 3 绿色
			String progressState1 = "3";
			@@ -973,37 +1082,53 @@

			return userRecordVO;
			}



			@Transactional
			@Override
			public void activatedWelfareFreeCoupon(Long uid) {
			public void activatedWelfareFreeCoupon(Long uid, String fromNickName) {

			LogHelper.test("券激活:" + uid);
			if (uid == null) {
			return;
			}
			// 福利免单券
			String welfareFree = CouponTypeEnum.welfareFreeCoupon.name();


			SystemCoupon systemCoupon = systemCouponService.getCouponByType(welfareFree);
			if (systemCoupon == null) {
			return;
			}


			// 验证是否失效
			updateCounponInvalid(uid);

			// 待活福利免单券
			List<UserSystemCoupon> list = userSystemCouponMapper.getCouponByTypeAndNotActivated(uid, systemCoupon.getId());
			if (list == null \|\| list.size() == 0) {
			return;
			}

			for (UserSystemCoupon userSystemCoupon: list) {

			for (UserSystemCoupon userSystemCoupon : list) {
			// 激活
			userSystemCoupon.setStateActivated(1);
			userSystemCoupon.setUpdateTime(new Date());
			userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);

			UserSystemCoupon update = new UserSystemCoupon();
			update.setId(userSystemCoupon.getId());
			update.setStateActivated(1);
			update.setUpdateTime(new Date());
			userSystemCouponMapper.updateByPrimaryKeySelective(update);

			Integer state = userSystemCoupon.getState();
			if (UserSystemCoupon.STATE_OVERDUE == state) {
			continue; // 已失效不做消息推送
			}

			// 消息推送
			try {
			userOtherMsgNotificationService.welfareCouponGet(userSystemCoupon);
			} catch(Exception e) {
			UserInfo userInfo = new UserInfo();
			userInfo.setId(uid);
			userInfo.setNickName(fromNickName);

			userOtherMsgNotificationService.welfareCouponActive(userSystemCoupon, userInfo);
			} catch (Exception e) {
			try {
			LogHelper.errorDetailInfo(e);
			} catch (Exception e1) {
			@@ -1011,44 +1136,90 @@
			}
			}
			}


			}


			@Transactional
			@Override
			public void updateStateByDrawback(String orderNo) throws Exception {

			if (orderNo == null \|\| orderNo.trim().length() == 0) {
			return;
			}

			UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo, null);
			if (record == null) {
			return;
			}

			record.setOrderNo(orderNo);
			record.setUpdateTime(new Date());
			record.setState(UserSystemCouponRecord.STATE_FAIL_DRAWBACK);
			userSystemCouponRecordService.updateByPrimaryKeySelective(record);

			// 券退回
			sendBackCoupon(record.getUserSystemCoupon(), record);
			}

			@Transactional
			@Override
			public void updateStateByArrivalAccount(String orderNo) throws Exception {

			if (orderNo == null \|\| orderNo.trim().length() == 0) {
			return;
			}

			UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo, 2);
			if (record == null) {
			return;
			}

			record.setOrderNo(orderNo);
			record.setUpdateTime(new Date());
			record.setState(UserSystemCouponRecord.STATE_SUCCESS);
			userSystemCouponRecordService.updateByPrimaryKeySelective(record);

			// 消息推送
			if (CouponTypeEnum.welfareFreeCoupon.name().equals(record.getCouponType())) {
			userOtherMsgNotificationService.welfareCouponUsed(record.getUserSystemCoupon(), orderNo);
			} else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) {
			userOtherMsgNotificationService.freeSheetCouponUsed(record.getUserSystemCoupon(), orderNo);
			}
			}

			@Transactional
			@Override
			public void updateCounponInvalid(Long uid) {
			List<UserSystemCoupon> list = userSystemCouponMapper.getCounponNowInvalid(uid);
			if (list == null \|\| list.size() == 0) {
			return;
			}

			for (UserSystemCoupon userSystemCoupon: list) {

			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) {
			if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
			userOtherMsgNotificationService.welfareCouponAlreadyOutOfDate(userSystemCoupon);
			} else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
			} else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
			userOtherMsgNotificationService.freeSheetCouponAlreadyOutOfDate(userSystemCoupon);
			} else if (baseCoupon.getType() != CouponTypeEnum.rebatePercentCoupon) {
			} else if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
			userOtherMsgNotificationService.rewardCouponAlreadyOutOfDate(userSystemCoupon);
			}

			} catch(Exception e) {

			} catch (Exception e) {
			try {
			LogHelper.errorDetailInfo(e);
			} catch (Exception e1) {
			@@ -1057,35 +1228,37 @@
			}
			}
			}


			@Transactional
			@Override
			public void sendBackTimeOutCoupon(Long uid) {
			// 超过120秒未被匹配的券
			List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120);
			public void sendBackTimeOutCoupon(Long uid) {
			// 超过10分钟未被匹配的券
			List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid,600L);
			if (list == null \|\| list.size() == 0) {
			return;
			}

			for (UserSystemCouponRecord couponRecord: list) {

			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());
			SystemCoupon coupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
			if (coupon != null) {
			expiryDay = coupon.getExpiryDay();
			}

			}

			// 结束日期
			Date endTime = null;
			try {
			String endDay = DateUtil.plusDay(expiryDay, new Date());
			// 今天在内减去一天
			String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
			endTime = format.parse(endDay);
			} catch (ParseException e) {
			@@ -1094,7 +1267,7 @@
			// 状态初始化
			userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
			userSystemCoupon.setUseTime(null);


			// 有效期时间重新定义
			userSystemCoupon.setStartTime(new Date());
			userSystemCoupon.setEndTime(endTime);
			@@ -1102,32 +1275,29 @@
			userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
			}
			}


			@Transactional
			@Override
			public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment,
			Long auctionId) throws Exception{

			//只处理付款金额小于10的
			if(payment==null\|\|payment.compareTo(new BigDecimal(10))<0)
			return false;

			public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId)
			throws Exception {

			boolean isfree = false;

			if (uid == null \|\| payment == null \|\| auctionId == null \|\| orderNo == null \|\|
			orderNo.trim().length() == 0 ) {

			if (uid == null \|\| payment == null \|\| auctionId == null \|\| orderNo == null \|\| orderNo.trim().length() == 0) {
			throw new Exception("传递参数不能为空");
			}


			// 查询等待匹配的券记录
			List<UserSystemCouponRecord> list = userSystemCouponRecordService.getRecordByState(uid, UserSystemCouponRecord.STATE_WAIT);
			List<UserSystemCouponRecord> list = userSystemCouponRecordService.getRecordByState(uid,
			UserSystemCouponRecord.STATE_WAIT);
			if (list == null \|\| list.size() == 0) {
			return isfree;
			return isfree;
			}


			// 匹配
			boolean matching = false;
			UserSystemCouponRecord record = null;


			for (UserSystemCouponRecord userSystemCouponRecord : list) {
			Long goodId = userSystemCouponRecord.getGoodId();
			if (auctionId.equals(goodId)) {
			@@ -1136,58 +1306,58 @@
			break;
			}
			}


			// 商品匹配成功
			if (matching) {


			record.setOrderNo(orderNo);
			record.setUpdateTime(new Date());


			UserSystemCoupon userSystemCoupon = record.getUserSystemCoupon();


			if (payment.compareTo(new BigDecimal(10)) > 0) {
			// 更新记录 -- 金额不匹配大10元
			// 更新记录 -- 金额不匹配大10元
			record.setState(UserSystemCouponRecord.STATE_FAIL_RULE);
			userSystemCouponRecordService.updateByPrimaryKeySelective(record);


			// 退回券
			sendBackCoupon(userSystemCoupon);

			sendBackCoupon(userSystemCoupon, record);

			} else {
			// 免单匹配成功
			isfree = true;

			//更新记录--免单中

			// 更新记录--免单中
			record.setState(UserSystemCouponRecord.STATE_FREE_ON);
			userSystemCouponRecordService.updateByPrimaryKeySelective(record);


			// 券结束使用
			userSystemCoupon.setState(UserSystemCoupon.STATE_END_USE);
			userSystemCoupon.setUpdateTime(new Date());
			userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);

			SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();

			SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
			if (baseCoupon == null) {
			// 券已使用
			userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);
			} else if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
			userOtherMsgNotificationService.welfareCouponUsed(userSystemCoupon);
			} else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
			userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);
			}

			String couponType = record.getCouponType();
			if (couponType == null \|\| couponType.trim().length() == 0) {
			throw new Exception("券类型未被记录");
			}

			if (CouponTypeEnum.welfareFreeCoupon.name().equals(couponType)) {
			userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon, orderNo, payment);
			} else if (CouponTypeEnum.freeCoupon.name().equals(couponType)) {
			userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon, orderNo, payment);
			}
			}
			}


			return isfree;
			}


			/**
			* 退回券初始数据
			*
			* @param userSystemCoupon
			*/
			public void sendBackCoupon(UserSystemCoupon userSystemCoupon) throws Exception{
			public void sendBackCoupon(UserSystemCoupon userSystemCoupon, UserSystemCouponRecord record) throws Exception {

			int expiryDay = 15;

			@@ -1200,7 +1370,8 @@
			// 结束日期
			Date endTime = null;
			try {
			String endDay = DateUtil.plusDay(expiryDay, new Date());
			// 今天在内减去一天
			String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
			endTime = format.parse(endDay);
			} catch (ParseException e) {
			@@ -1212,12 +1383,248 @@
			// 有效期时间重新定义
			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);

			}


			@Override
			@Transactional
			public void randomRewardCoupon(int num, Long uid, String source) throws Exception {
			if (num < 1) {
			return;
			}

			for (int i = 0; i < num; i++) {

			// 返利比-随机
			BigDecimal percent = new BigDecimal(randomNum());
			// 查询奖励券
			SystemCoupon systemCoupon = systemCouponService.getCouponByTypeAndPercent(
			CouponTypeEnum.rebatePercentCoupon.name(),percent);
			if (systemCoupon == null) {
			return;
			}

			// 结束日期今天在内减去一天
			String endDay = DateUtil.plusDay(systemCoupon.getExpiryDay() - 1, new Date());
			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
			Date endTime = format.parse(endDay);

			UserSystemCoupon userCoupon = new UserSystemCoupon();
			userCoupon.setUid(uid);
			userCoupon.setSource(source);
			userCoupon.setSystemCoupon(systemCoupon);
			userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
			userCoupon.setStateActivated(1);
			userCoupon.setStartTime(new Date());
			userCoupon.setEndTime(endTime);
			userCoupon.setCreateTime(new Date());
			userCoupon.setUpdateTime(new Date());
			// 插入数据库
			insertSelective(userCoupon);

			// 消息推送
			try {
			userOtherMsgNotificationService.rewardCouponGet(userCoupon,systemCoupon.getPercent().intValue());
			} catch(Exception e) {
			try {
			LogHelper.errorDetailInfo(e);
			} catch (Exception e1) {
			e1.printStackTrace();
			}
			}
			}

			// 福利中心红点
			UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
			if (userInfoExtra == null) {
			return;
			}
			Integer couponNews = userInfoExtra.getCouponNews();
			if (couponNews == null) {
			userInfoExtra.setCouponNews(num);
			} else {
			userInfoExtra.setCouponNews(couponNews + num);
			}
			userInfoExtraService.saveUserInfoExtra(userInfoExtra);
			}

			/**
			* 随机券比例
			* @return
			*/
			public int randomNum() {

			int result = 1;

			List<RandomProportion> list = new ArrayList<RandomProportion>();
			list.add(new RandomProportion(1, 22));
			list.add(new RandomProportion(2, 22));
			list.add(new RandomProportion(3, 22));
			list.add(new RandomProportion(4, 22));
			list.add(new RandomProportion(5, 20));
			list.add(new RandomProportion(6, 18));
			list.add(new RandomProportion(7, 16));
			list.add(new RandomProportion(8, 14));
			list.add(new RandomProportion(9, 12));
			list.add(new RandomProportion(10, 10));
			list.add(new RandomProportion(11, 8));
			list.add(new RandomProportion(12, 6));
			list.add(new RandomProportion(13, 4));
			list.add(new RandomProportion(14, 2));
			list.add(new RandomProportion(15, 1));

			int minRange = 0;
			int maxRange = 0;
			int randomNum = (int) (1 + Math.round(Math.random() * (199)));

			for (int i = 0; i < list.size(); i++) {

			RandomProportion proportion = list.get(i);
			int probability = proportion.probability;

			maxRange = maxRange + probability;
			minRange = maxRange - probability;

			if(randomNum > minRange && randomNum <= maxRange) {
			result = proportion.num;
			break;
			}
			}

			return result;
			}

			class RandomProportion {
			public int num;//券值
			public int probability; // 概率

			RandomProportion () {}

			RandomProportion (int num, int probability) {
			this.num = num;
			this.probability = probability;
			}
			}

			}