fanli-server.git

			@@ -17,17 +17,23 @@
			import org.yeshi.utils.DateUtil;

			import com.yeshi.fanli.dao.mybatis.user.vip.UserVIPInfoMapper;
			import com.yeshi.fanli.dto.msg.MsgAccountVipDTO;
			import com.yeshi.fanli.dto.msg.MsgOtherVIPDTO;
			import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;
			import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail.MsgTypeAccountTypeEnum;
			import com.yeshi.fanli.entity.bus.user.HongBaoV2;
			import com.yeshi.fanli.entity.bus.user.ThreeSale;
			import com.yeshi.fanli.entity.bus.user.UserInfo;
			import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
			import com.yeshi.fanli.entity.bus.user.UserInviteSeparate;
			import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
			import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
			import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;
			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.system.SystemCoupon.CouponTypeEnum;
			import com.yeshi.fanli.exception.msg.MsgAccountDetailException;
			import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;
			import com.yeshi.fanli.service.inter.config.ConfigService;
			import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
			@@ -39,7 +45,9 @@
			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.msg.MsgAccountDetailService;
			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;
			@@ -84,6 +92,12 @@
			@Lazy
			@Resource
			private UserSystemCouponService userSystemCouponService;

			@Resource
			private UserVIPPreInfoService userVIPPreInfoService;

			@Resource
			private MsgAccountDetailService msgAccountDetailService;

			@Override
			@Transactional(rollbackFor = Exception.class)
			@@ -255,8 +269,14 @@

			@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;
			@@ -299,29 +319,26 @@

			// 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);
			// long teamNum =
			// hongBaoV2CountService.countValidOrderTeamUserByUid(uid,
			// TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney);
			long teamNum = 0L;
			long vipBegin = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
			List<ThreeSale> listThreeSale = threeSaleSerivce.getValidWorkerIdsByTime(uid, vipBegin);
			if (listThreeSale != null && listThreeSale.size() > 0) {
			for (ThreeSale three: listThreeSale) {
			for (ThreeSale three : listThreeSale) {
			UserInfo worker = three.getWorker();
			if (worker == null \|\| worker.getId() == null) {
			continue;
			}
			// 1、邀请关系成功后；2、单（分享 + 自购）实付款大于1元
			long countValid = hongBaoV2CountService.countValidOrderByUidAndTime(worker.getId(), three.getSucceedTime(), payMoney);
			long countValid = hongBaoV2CountService.countValidOrderByUidAndTime(worker.getId(),
			three.getSucceedTime(), payMoney);
			if (countValid > 0) {
			teamNum ++;
			teamNum++;
			}
			}
			}






			// 区分老用户和新用户
			String limtDate = userVipConfigService.getValueByKey("vip_execute_time");
			@@ -434,4 +451,162 @@
			}
			}

			@Transactional(rollbackFor = Exception.class)
			@Override
			public void applyVIPNew(Long uid) throws UserVIPInfoException {
			UserVIPPreInfo latestProcess = userVIPPreInfoService.getLatestProcessInfo(uid);
			if (latestProcess == null \|\| latestProcess.getProcess() != UserVIPPreInfo.PROCESS_2) {
			throw new UserVIPInfoException(1, "该用户还不是高级会员");
			}

			if (!verifyVipNew(uid))
			throw new UserVIPInfoException(1, "系统验证：不满足升级条件");

			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);

			MsgAccountDetail detail = new MsgAccountDetail();
			detail.setTitle("尊敬的高级会员，系统已收到你的超级会员升级申请，正在受理中");
			detail.setBeiZhu("如有疑问请联系我的-人工客服");
			detail.setRead(false);
			detail.setCreateTime(new Date());
			detail.setUser(new UserInfo(uid));
			detail.setContent("我们将会在48小时内完成审核");
			detail.setType(MsgTypeAccountTypeEnum.vipApply);
			try {
			msgAccountDetailService.addMsgAccountDetail(detail);
			} catch (MsgAccountDetailException e) {
			e.printStackTrace();
			}
			}

			@Transactional(rollbackFor = Exception.class)
			@Override
			public void passVIPApplyNew(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 (!verifyVipNew(uid))
			throw new UserVIPInfoException(1, "系统验证：不满足升级条件");

			// 额外信息
			UserInfoExtra userInfoExtra = userInfoExtraService.getByUidForUpdate(uid);
			if (userInfoExtra == null)
			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);

			// 添加金币
			userInfoExtraService.addGoldCoinByUid(uid, Constant.VIP_COLDCOIN_NUM);
			// 添加金币明细
			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);

			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, "券赠送失败");
			}

			// 消息
			MsgAccountVipDTO msgDto = new MsgAccountVipDTO();
			msgDto.setStatus("已将你的账户由高级会员升级为超级会员");
			msgDto.setEquity("从收到本消息起，你将获得全部超级会员权益");
			msgAccountDetailService.addMsgVIP(uid, "恭喜你！经人工审核你满足升级超级会员条件", "如有疑问请联系我的-人工客服", msgDto);
			}

			/**
			* 验证是否符合VIP
			* @param uid
			* @return
			*/
			private boolean verifyVipNew(Long uid) {
			// 邀请订单
			long countZiGou = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
			HongBaoV2.TYPE_ZIGOU);
			// 邀请订单
			long countShare = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
			HongBaoV2.TYPE_SHARE_GOODS);
			// 队员
			long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
			long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);

			if (countZiGou >= Constant.VIP_PROCESS_3_ZIGOU \|\| countShare >= Constant.VIP_PROCESS_3_SHARE
			\|\| (firstTeam >= Constant.VIP_PROCESS_3_TEAM && secondTeam >= Constant.VIP_PROCESS_3_TEAM_SECOND)) {
			return true;
			}
			return false;
			}

			@Transactional(rollbackFor = Exception.class)
			@Override
			public void rejectVIPApplyNew(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);

			// 消息
			MsgAccountVipDTO msgDto = new MsgAccountVipDTO();
			msgDto.setStatus("你的账号仍是高级会员");
			msgDto.setReason(reason);
			msgAccountDetailService.addMsgVIP(uid, "很抱歉！经人工审核你未满足或不符合升级超级会员的条件", "如有疑问请联系我的-人工客服", msgDto);
			}

			}