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

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java |  501 +++++++++++++++++++++++++-----------------------------
 1 files changed, 233 insertions(+), 268 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java
index c1dcae6..fd6b9db 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java
@@ -1,9 +1,5 @@
 package com.yeshi.fanli.service.impl.user.vip;
 
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -17,16 +13,12 @@
 import org.yeshi.utils.DateUtil;
 
 import com.yeshi.fanli.dao.mybatis.user.vip.UserVIPInfoMapper;
-import com.yeshi.fanli.dto.msg.MsgOtherVIPDTO;
-import com.yeshi.fanli.entity.bus.user.ThreeSale;
-import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
-import com.yeshi.fanli.entity.bus.user.UserInviteSeparate;
+import com.yeshi.fanli.entity.bus.user.UserInviteValidNum;
 import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
 import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
-import com.yeshi.fanli.entity.integral.IntegralDetail;
-import com.yeshi.fanli.entity.shop.BanLiShopOrder;
-import com.yeshi.fanli.entity.system.ConfigKeyEnum;
+import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;
 import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
 import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;
 import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -39,10 +31,13 @@
 import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
 import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;
 import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;
+import com.yeshi.fanli.service.inter.user.msg.UserAccountMsgNotificationService;
 import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
+import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;
 import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
 import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.StringUtil;
 
 @Service
 public class UserVIPInfoServiceImpl implements UserVIPInfoService {
@@ -85,6 +80,15 @@
 	@Resource
 	private UserSystemCouponService userSystemCouponService;
 
+	@Resource
+	private UserVIPPreInfoService userVIPPreInfoService;
+
+	@Resource
+	private UserAccountMsgNotificationService userAccountMsgNotificationService;
+	
+	@Resource
+	private UserInviteValidNumService userInviteValidNumService;
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void addUserVIPInfo(UserVIPInfo info) throws UserVIPInfoException {
@@ -101,162 +105,17 @@
 		userVIPInfoMapper.insert(info);
 	}
 
-	@Transactional(rollbackFor = Exception.class)
-	@Override
-	public void passVIPApply(Long uid) throws UserVIPInfoException {
-		UserVIPInfo userVIPInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);
-		if (userVIPInfo == null) {
-			throw new UserVIPInfoException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
-		}
-		if (userVIPInfo.getState() != UserVIPInfo.STATE_VERIFING) {
-			throw new UserVIPInfoException(2, "鐢宠鏈浜庡鏍哥姸鎬�");
-		}
-
-		if (!verifyConform(uid))
-			throw new UserVIPInfoException(1, "绯荤粺楠岃瘉锛氫笉婊¤冻鍗囩骇鏉′欢");
-
-		UserVIPInfo info = new UserVIPInfo();
-		info.setId(userVIPInfo.getId());
-		info.setSuccessTime(new Date());
-		info.setState(UserVIPInfo.STATE_SUCCESS);
-		info.setUpdateTime(new Date());
-		userVIPInfoMapper.updateByPrimaryKeySelective(info);
-
-		// 涓嬬骇鐨勮秴绾т細鍛� 涓嶈劚绂�
-		userInviteSeparateService.updateInvalidByBossId(uid);
-
-		// 棰濆淇℃伅
-		UserInfoExtra userInfoExtra = userInfoExtraService.getByUidForUpdate(uid);
-		if (userInfoExtra == null)
-			throw new UserVIPInfoException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
-
-		// 娣诲姞閲戝竵
-		IntegralDetail detail = new IntegralDetail();
-		detail.setTitle("鍗囩骇VIP绂忓埄");
-		detail.setUid(uid);
-		detail.setMoney(Constant.VIP_COLDCOIN_NUM);
-		detail.setCreateTime(new Date());
-		detail.setUniqueKey("VIP-" + uid);
-		integralDetailService.insertSelective(detail);
-		userInfoExtraService.addGoldCoinByUid(uid, Constant.VIP_COLDCOIN_NUM);
-
-		try {
-			// 濂栧姳鍒�
-			BigDecimal percent = new BigDecimal(configService.get(ConfigKeyEnum.exchangeRebatePercent.getKey()));
-			for (int i = 0; i < Constant.VIP_COUPON_REWARD_NUM; i++) {
-				userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(),
-						UserSystemCoupon.SOURCE_SYSTEM_PUSH, percent, false);
-			}
-
-			// 璧犻�佸厤鍗曞埜
-			for (int i = 0; i < Constant.VIP_COUPON_GIVEFREE_NUM; i++) {
-				userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.freeCouponGive.name(),
-						UserSystemCoupon.SOURCE_SYSTEM_PUSH, null, false);
-			}
-		} catch (Exception e) {
-			throw new UserVIPInfoException(1, "鍒歌禒閫佸け璐�");
-		}
-
-		// 娑堟伅
-		MsgOtherVIPDTO msgOther = new MsgOtherVIPDTO();
-		msgOther.setContent1("鎭枩浣狅紝宸叉垚涓鸿秴绾т細鍛�");
-		msgOther.setContent2("婊¤冻鍗囩骇鏉′欢");
-		msgOther.setContent3(TimeUtil.formatDateDot(new Date()));
-		userOtherMsgNotificationService.passVIPApplyMsg(uid, "杩斿埄濂栧姳鍒稿拰銆佽禒閫佸厤鍗曞埜鍜岄噾甯佽鍒版垜鐨�-绂忓埄涓績涓煡鐪�", msgOther);
-
-		// 閫氱煡涓婄骇
-		callBoss(uid);
-	}
-
-	/**
-	 * 閫氱煡涓婄骇鑴辩鍏崇郴
-	 * 
-	 * @param uid
-	 */
-	@Transactional
-	private void callBoss(Long uid) {
-		// 鏄惁瀛樺湪涓婄骇
-		ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
-		if (threeSale == null)
-			return;
-		// 涓婄骇鏄惁涓轰細鍛�
-		Long bossId = threeSale.getBoss().getId();
-		UserVIPInfo bossVIP = userVIPInfoMapper.selectByPrimaryKeyForUpdate(bossId);
-		if (bossVIP != null && bossVIP.getState() != null && bossVIP.getState() == UserVIPInfo.STATE_SUCCESS)
-			return;
-
-		// 涔嬪墠鎻掑叆璁板綍澶辨晥
-		userInviteSeparateService.updateStateByWorkerIdAndBossId(uid, bossId, UserInviteSeparate.STATE_INVALID);
-
-		// 闄愬埗鏃堕棿
-		int limitDays = Integer.parseInt(configService.get(ConfigKeyEnum.inviteSeparateLimitDays.getKey()));
-		UserInviteSeparate inviteSeparate = new UserInviteSeparate();
-		inviteSeparate.setBossId(bossId);
-		inviteSeparate.setWorkerId(uid);
-		inviteSeparate.setState(UserInviteSeparate.STATE_INIT);
-		inviteSeparate.setEndTime(DateUtil.plusDayDate(limitDays, new Date()));
-		inviteSeparate.setCreateTime(new Date());
-		inviteSeparate.setUpdateTime(new Date());
-		userInviteSeparateService.insertSelective(inviteSeparate);
-
-		UserInfo userInfo = userInfoService.selectByPKey(uid);
-		// 娑堟伅
-		MsgOtherVIPDTO msgboss = new MsgOtherVIPDTO();
-		msgboss.setContent1(userInfo.getNickName() + " " + uid);
-		msgboss.setContent2("浜�" + TimeUtil.formatDateDot(new Date()) + "鎴愬姛鍗囩骇鎴愪负瓒呯骇浼氬憳");
-		msgboss.setContent3("浠婃棩璧�" + limitDays + "澶╁唴锛屼綘鏈兘鎴愪负瓒呯骇浼氬憳灏嗕細涓庡叾鑴辩閭�璇峰叧绯� ");
-		userOtherMsgNotificationService.teamVIPCallBoss(bossId, "濡傛湁鐤戦棶璇疯仈绯绘垜鐨�-浜哄伐瀹㈡湇", msgboss);
-	}
-
-	@Transactional(rollbackFor = Exception.class)
-	@Override
-	public void rejectVIPApply(Long uid, String reason) throws UserVIPInfoException {
-		UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);
-		if (userInfo == null) {
-			throw new UserVIPInfoException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
-		}
-		if (userInfo.getState() != UserVIPInfo.STATE_VERIFING) {
-			throw new UserVIPInfoException(2, "鐢宠鏈浜庡鏍哥姸鎬�");
-		}
-
-		UserVIPInfo info = new UserVIPInfo();
-		info.setId(userInfo.getId());
-		info.setState(UserVIPInfo.STATE_INVALID);
-		info.setUpdateTime(new Date());
-		userVIPInfoMapper.updateByPrimaryKeySelective(info);
-
-		// 娑堟伅
-		MsgOtherVIPDTO msgOther = new MsgOtherVIPDTO();
-		msgOther.setContent1("寰堟姳姝夛紝鏈�氳繃瓒呯骇浼氬憳鐢宠");
-		msgOther.setContent2("鏈弧瓒宠秴绾т細鍛樺崌绾ф潯浠舵垨鐤戜技鍑虹幇杩濊 ");
-		userOtherMsgNotificationService.rejectVIPApply(uid, "濡傛湁鐤戦棶璇疯仈绯绘垜鐨�-浜哄伐瀹㈡湇", msgOther);
-	}
-
-	@Transactional(rollbackFor = Exception.class)
-	@Override
-	public void applyVIP(Long uid) throws UserVIPInfoException {
-		UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);
-		if (userInfo == null) {
-			userInfo = new UserVIPInfo();
-			userInfo.setId(uid);
-			addUserVIPInfo(userInfo);
-		}
-
-		if (userInfo.getState() != UserVIPInfo.STATE_INVALID)
-			throw new UserVIPInfoException(2, "宸茬粡鐢宠杩�");
-
-		UserVIPInfo info = new UserVIPInfo();
-		info.setId(userInfo.getId());
-		info.setApplyTime(new Date());
-		info.setState(UserVIPInfo.STATE_VERIFING);
-		info.setUpdateTime(new Date());
-		userVIPInfoMapper.updateByPrimaryKeySelective(info);
-	}
 
 	@Override
 	public boolean isVIP(Long uid) {
+		return isVIP(uid, System.currentTimeMillis());
+	}
+
+	@Override
+	public boolean isVIP(Long uid, Long time) {
 		UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKey(uid);
-		if (userInfo != null && userInfo.getState() == UserVIPInfo.STATE_SUCCESS)
+		if (userInfo != null && userInfo.getState() == UserVIPInfo.STATE_SUCCESS
+				&& userInfo.getSuccessTime().getTime() < time)
 			return true;
 		else
 			return false;
@@ -288,65 +147,6 @@
 		return map;
 	}
 
-	@Override
-	public boolean verifyConform(Long uid) {
-		if (uid == null || uid <= 0)
-			return false;
-
-		UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
-		if (extra == null)
-			return false;
-
-		// 1銆佺洿鎺ョ矇涓濓紙浠� 2020 骞� 1 鏈� 1 鏃ヨ捣鐩存帴绮変笣浜х敓鏈夋晥璁㈠崟锛�
-		BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
-		long teamNum = hongBaoV2CountService.countValidOrderTeamUserByUid(uid,
-				TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney);
-
-		// 鍖哄垎鑰佺敤鎴峰拰鏂扮敤鎴�
-		String limtDate = userVipConfigService.getValueByKey("vip_execute_time");
-		Date executeDate = null;
-		try {
-			SimpleDateFormat format = new SimpleDateFormat("yyyy-mm-dd");
-			executeDate = format.parse(limtDate);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-		if (executeDate == null)
-			return false;
-
-		if (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime()) {
-			long limitNum = Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_old_user"));
-			if (teamNum < limitNum)
-				return false;
-		} else {
-			long limitNum = Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_new_user"));
-			if (teamNum < limitNum)
-				return false;
-		}
-
-		// 2銆佺疮璁¤嚜璐繑鍒┾墺100 鍏冿紙浠庢敞鍐屾澘鏍楀揩鐪佽捣锛夛紱
-		BigDecimal fanMoney = new BigDecimal(userVipConfigService.getValueByKey("require_fan_money"));
-		BigDecimal purchase = hongBaoV2CountService.getRewardMoneyBySelf(uid);
-		if (purchase.compareTo(fanMoney) < 0)
-			return false;
-
-		// 3銆佺疮璁¢噾甯佲墺10000 鏋氾紙浠庢敞鍐屾澘鏍楀揩鐪佽捣锛夛紱
-		BigDecimal goldCoin = integralDetailService.getCumulativeMoney(uid);
-		BigDecimal limitGoldCoin = new BigDecimal(userVipConfigService.getValueByKey("require_gold_coin"));
-		if (goldCoin.compareTo(limitGoldCoin) < 0)
-			return false;
-
-		// 4銆佷娇鐢ㄧ孩鍖呪墺1 娆�
-		List<Integer> list = new ArrayList<Integer>();
-		list.add(BanLiShopOrder.STATE_SUCCESS);
-		long useHongBao = banLiShopOrderService.countByUidAndState(uid, list);
-		long limitHongBao = Long.parseLong(userVipConfigService.getValueByKey("require_shop_buy"));
-		if (useHongBao < limitHongBao)
-			return false;
-
-		// 绗﹀悎鏉′欢
-		return true;
-	}
 
 	@Override
 	public List<UserVIPInfo> listQuery(int page, int count, String key, Integer state) {
@@ -358,59 +158,224 @@
 		return userVIPInfoMapper.countQuery(key, state);
 	}
 
-	@Override
+
 	@Transactional(rollbackFor = Exception.class)
-	public void inviteSeparate(Long workerId, Long bossId) {
-		if (workerId == null || bossId == null)
-			return;
+	@Override
+	public void applyVIP(Long uid) throws UserVIPInfoException {
+		UserVIPPreInfo latestProcess = userVIPPreInfoService.getLatestProcessInfo(uid);
+		if (latestProcess == null || latestProcess.getProcess() != UserVIPPreInfo.PROCESS_2) {
+			throw new UserVIPInfoException(1, "璇峰厛鍗囩骇涓洪珮绾т細鍛�");
+		}
 
-		// 鏌ヨ璁板綍
-		UserInviteSeparate userInviteSeparate = userInviteSeparateService.selectByWorkerIdAndBossId(workerId, bossId);
-		if (userInviteSeparate == null)
-			return;
+		if (!verifyVip(uid))
+			throw new UserVIPInfoException(1, "涓嶆弧瓒冲崌绾ф潯浠�");
 
-		// 鏄惁瀛樺湪閭�璇峰叧绯�
-		ThreeSale threeSale = threeSaleSerivce.getMyBoss(workerId);
-		if (threeSale == null)
-			return;
-		Long bossIdExist = threeSale.getBoss().getId();
-		if (bossIdExist == null || bossId.longValue() != bossIdExist.longValue())
-			return;
+		UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);
+		if (userInfo == null) {
+			userInfo = new UserVIPInfo();
+			userInfo.setId(uid);
+			addUserVIPInfo(userInfo);
+		}
 
-		// 涓婄骇浼氬憳鎯呭喌
-		boolean separate = false;
-		UserVIPInfo userVIPInfo = userVIPInfoMapper.selectByPrimaryKey(bossId);
-		if (userVIPInfo != null && userVIPInfo.getState() != null
-				&& userVIPInfo.getState() == UserVIPInfo.STATE_SUCCESS) {
-			if (userInviteSeparate.getEndTime().getTime() < userVIPInfo.getSuccessTime().getTime()) {
-				separate = true; // 缁撴潫鏃堕棿宸茬粡瓒呰繃
+		if (userInfo.getState() != UserVIPInfo.STATE_INVALID)
+			throw new UserVIPInfoException(2, "绯荤粺宸叉敹鍒颁綘鐨勮秴绾т細鍛樺崌绾х敵璇凤紝灏嗕細灏藉揩瀹屾垚瀹℃牳");
+
+		UserVIPInfo info = new UserVIPInfo();
+		info.setId(userInfo.getId());
+		info.setApplyTime(new Date());
+		info.setState(UserVIPInfo.STATE_VERIFING);
+		info.setUpdateTime(new Date());
+		userVIPInfoMapper.updateByPrimaryKeySelective(info);
+	}
+
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public void passVIPApply(Long uid) throws UserVIPInfoException {
+		UserVIPInfo userVIPInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);
+		if (userVIPInfo == null) {
+			throw new UserVIPInfoException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+		}
+		if (userVIPInfo.getState() != UserVIPInfo.STATE_VERIFING) {
+			throw new UserVIPInfoException(2, "鐢宠鏈浜庡鏍哥姸鎬�");
+		}
+
+		UserVIPPreInfo latestProcess = userVIPPreInfoService.getLatestProcessInfo(uid);
+		if (latestProcess == null || latestProcess.getProcess() != UserVIPPreInfo.PROCESS_2) {
+			throw new UserVIPInfoException(1, "璇ョ敤鎴疯繕涓嶆槸楂樼骇浼氬憳");
+		}
+
+		if (!verifyVip(uid))
+			throw new UserVIPInfoException(1, "绯荤粺楠岃瘉锛氫笉婊¤冻鍗囩骇鏉′欢");
+
+		// 棰濆淇℃伅
+		UserInfoExtra userInfoExtra = userInfoExtraService.getByUidForUpdate(uid);
+		if (userInfoExtra == null)
+			throw new UserVIPInfoException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+
+		Date upgradeTime = new Date();
+		// 閫氳繃瓒呯骇浼氬憳
+		UserVIPInfo info = new UserVIPInfo();
+		info.setId(userVIPInfo.getId());
+		info.setSuccessTime(upgradeTime);
+		info.setState(UserVIPInfo.STATE_SUCCESS);
+		info.setUpdateTime(upgradeTime);
+		userVIPInfoMapper.updateByPrimaryKeySelective(info);
+
+		try {
+			// 璧犻�佸厤鍗曞埜
+			String giveCoupon = userVipConfigService.getValueByKey("vip_pre_10_gift_givefree_coupon");
+			if (!StringUtil.isNullOrEmpty(giveCoupon)) {
+				int num = Integer.parseInt(giveCoupon);
+				userSystemCouponService.freeCouponWin(uid, CouponTypeEnum.freeCouponGive,
+						UserSystemCoupon.SOURCE_SYSTEM_PUSH, num, true);
 			}
-		} else {
-			separate = true; // 涓婄骇闈炰細鍛�
+		} catch (Exception e) {
+			throw new UserVIPInfoException(1, "鍒歌禒閫佸け璐�");
+		}
+		
+		try {
+			// 鍗囩骇娑堟伅
+			UserVIPPreInfo pre1 = userVIPPreInfoService.getVipByProcess(uid, UserVIPPreInfo.PROCESS_2);
+			int days = DateUtil.daysBetween(pre1.getCreateTime(), new Date());
+			userAccountMsgNotificationService.vipUpgradeSuccess(uid, days);
+			
+			// 鍗囩骇鎻愰啋涓婄骇
+			userVIPPreInfoService.remindBoss(uid, "瓒呯骇浼氬憳", getPassItem(uid), upgradeTime, false);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+
+	/**
+	 * 楠岃瘉鏄惁绗﹀悎VIP
+	 * @param uid
+	 * @return
+	 */
+	private String getPassItem(Long uid) {
+		// 鑷喘璁㈠崟
+		long doneZiGou = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
+				HongBaoV2.TYPE_ZIGOU);
+		// 鍒嗕韩璁㈠崟
+		long doneShare = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
+				HongBaoV2.TYPE_SHARE_GOODS);
+		
+		// 鏈夋晥绮変笣
+		int doneFirst = 0;
+		int doneSecond = 0;
+		UserInviteValidNum userInviteValidNum = userInviteValidNumService.selectByPrimaryKey(uid);
+		if (userInviteValidNum != null) {
+			doneFirst = userInviteValidNum.getNumFirst() == null ? 0 : userInviteValidNum.getNumFirst();
+			doneSecond = userInviteValidNum.getNumSecond() == null ? 0 : userInviteValidNum.getNumSecond();
 		}
 
-		if (!separate) {
-			// 鏈劚绂�
-			userInviteSeparateService.updateStateByWorkerIdAndBossId(workerId, bossId,
-					UserInviteSeparate.STATE_INVALID);
-		} else {
-			// 鑴辩鍏崇郴
-			userInviteSeparateService.updateStateByWorkerIdAndBossId(workerId, bossId,
-					UserInviteSeparate.STATE_SUCCESS);
-
-			// 鑴辩閭�璇峰叧绯�
-			threeSaleSerivce.inviteSeparate(workerId, bossId);
-
-			int limitDays = Integer.parseInt(configService.get(ConfigKeyEnum.inviteSeparateLimitDays.getKey()));
-			// 娑堟伅
-			UserInfo userInfo = userInfoService.selectByPKey(workerId);
-			MsgOtherVIPDTO msgboss = new MsgOtherVIPDTO();
-			msgboss.setContent1(userInfo.getNickName() + workerId + "浜�"
-					+ TimeUtil.formatDateDot(userInviteSeparate.getCreateTime()) + "鎴愬姛鍗囩骇鎴愪负瓒呯骇浼氬憳 ");
-			msgboss.setContent2("寰堥仐鎲撅紝浣犳湭鑳藉湪" + limitDays + "澶╁崌绾т负瓒呯骇浼氬憳 ");
-			msgboss.setContent3("宸蹭笌鍏惰劚绂婚個璇峰叧绯�");
-			userOtherMsgNotificationService.teamSplitCallBoss(bossId, "濡傛湁鐤戦棶璇疯仈绯绘垜鐨�-浜哄伐瀹㈡湇", msgboss);
+		long limitZiGou = 0;
+		String zigou = userVipConfigService.getValueByKey("vip_pre_10_zigou_order_count");
+		if (!StringUtil.isNullOrEmpty(zigou)) {
+			limitZiGou = Long.parseLong(zigou);
 		}
+		
+		long limitShare = 0;
+		String share = userVipConfigService.getValueByKey("vip_pre_10_share_order_count");
+		if (!StringUtil.isNullOrEmpty(share)) {
+			limitShare = Long.parseLong(share);
+		}
+		
+		long limitFirst = 0;
+		String first = userVipConfigService.getValueByKey("vip_pre_10_first_level_team_count");
+		if (!StringUtil.isNullOrEmpty(first)) {
+			limitFirst = Long.parseLong(first);
+		}
+		
+		long limitSecond = 0;
+		String second = userVipConfigService.getValueByKey("vip_pre_10_second_level_team_count");
+		if (!StringUtil.isNullOrEmpty(second)) {
+			limitSecond = Long.parseLong(second);
+		}
+		
+		String item = "";
+		if (doneZiGou >= limitZiGou) {
+			item = "杩斿埄璁㈠崟";
+		} else if (doneShare >= limitShare) {
+			item = "鍒嗕韩璁㈠崟";
+		} else if (doneFirst >= limitFirst && doneSecond >= limitSecond) {
+			item = "閭�璇风矇涓�";
+		}
+		return item;
+	}
+	
+	
+	/**
+	 * 楠岃瘉鏄惁绗﹀悎VIP
+	 * @param uid
+	 * @return
+	 */
+	private boolean verifyVip(Long uid) {
+		// 鑷喘璁㈠崟
+		long doneZiGou = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
+				HongBaoV2.TYPE_ZIGOU);
+		// 鍒嗕韩璁㈠崟
+		long doneShare = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
+				HongBaoV2.TYPE_SHARE_GOODS);
+		
+		// 鏈夋晥绮変笣
+		int doneFirst = 0;
+		int doneSecond = 0;
+		UserInviteValidNum userInviteValidNum = userInviteValidNumService.selectByPrimaryKey(uid);
+		if (userInviteValidNum != null) {
+			doneFirst = userInviteValidNum.getNumFirst() == null ? 0 : userInviteValidNum.getNumFirst();
+			doneSecond = userInviteValidNum.getNumSecond() == null ? 0 : userInviteValidNum.getNumSecond();
+		}
+
+		long limitZiGou = 0;
+		String zigou = userVipConfigService.getValueByKey("vip_pre_10_zigou_order_count");
+		if (!StringUtil.isNullOrEmpty(zigou)) {
+			limitZiGou = Long.parseLong(zigou);
+		}
+		
+		long limitShare = 0;
+		String share = userVipConfigService.getValueByKey("vip_pre_10_share_order_count");
+		if (!StringUtil.isNullOrEmpty(share)) {
+			limitShare = Long.parseLong(share);
+		}
+		
+		long limitFirst = 0;
+		String first = userVipConfigService.getValueByKey("vip_pre_10_first_level_team_count");
+		if (!StringUtil.isNullOrEmpty(first)) {
+			limitFirst = Long.parseLong(first);
+		}
+		
+		long limitSecond = 0;
+		String second = userVipConfigService.getValueByKey("vip_pre_10_second_level_team_count");
+		if (!StringUtil.isNullOrEmpty(second)) {
+			limitSecond = Long.parseLong(second);
+		}
+		
+		if (doneZiGou >= limitZiGou || doneShare >= limitShare || (doneFirst >= limitFirst && doneSecond >= limitSecond)) {
+			return true;
+		}
+		return false;
+	}
+
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public void rejectVIPApply(Long uid, String reason) throws UserVIPInfoException {
+		UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);
+		if (userInfo == null) {
+			throw new UserVIPInfoException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+		}
+		if (userInfo.getState() != UserVIPInfo.STATE_VERIFING) {
+			throw new UserVIPInfoException(2, "鐢宠鏈浜庡鏍哥姸鎬�");
+		}
+
+		UserVIPInfo info = new UserVIPInfo();
+		info.setId(userInfo.getId());
+		info.setState(UserVIPInfo.STATE_INVALID);
+		info.setUpdateTime(new Date());
+		userVIPInfoMapper.updateByPrimaryKeySelective(info);
+
+		// 娑堟伅
+		userAccountMsgNotificationService.vipUpgradeFail(uid, reason);
 	}
 
 }

--
Gitblit v1.8.0