fanli-server.git

			@@ -23,12 +23,14 @@
			import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
			import com.yeshi.fanli.entity.bus.user.UserInfo;
			import com.yeshi.fanli.exception.user.ThreeSaleException;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
			import com.yeshi.fanli.service.inter.user.UserActiveLogService;
			import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
			import com.yeshi.fanli.service.inter.user.UserInfoService;
			import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
			import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;
			import com.yeshi.fanli.service.inter.user.invite.TeamFansInfoService;
			import com.yeshi.fanli.service.inter.user.invite.ThreeSaleExtraInfoSerivce;
			import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
			import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;
			@@ -73,6 +75,11 @@
			@Lazy
			@Resource
			private IntegralGetService integralGetService;

			@Lazy
			@Resource
			private TeamFansInfoService teamFansInfoService;


			@Resource(name = "taskExecutor")
			private TaskExecutor executor;
			@@ -105,16 +112,6 @@
			threeSale.setWorker(inviteeUser);
			threeSaleMapper.insertSelective(threeSale);

			List<ThreeSale> listExpire = threeSaleMapper.getExpireRecord(inviter.getId(), inviteeUser.getId());
			if (listExpire != null && listExpire.size() > 0) {
			// 删除失效
			for (ThreeSale saleExpire : listExpire) {
			msgInviteDetailService.deleteByThreeSale(saleExpire);
			}
			// 删除已失效关系
			threeSaleMapper.deleteExpireRecord(inviter.getId(), inviteeUser.getId());
			}

			} else {// 是已经存在的用户
			if (worker.getId().longValue() == inviter.getId())
			throw new ThreeSaleException(4, "不能绑定自己");
			@@ -144,20 +141,6 @@
			threeSale.setUpdateTime(java.lang.System.currentTimeMillis());
			threeSale.setWorker(worker);
			threeSaleMapper.insertSelective(threeSale);

			// 删除已失效关系
			threeSaleMapper.deleteExpireRecord(inviter.getId(), worker.getId());

			List<ThreeSale> listExpire = threeSaleMapper.getExpireRecord(inviter.getId(), worker.getId());
			if (listExpire != null && listExpire.size() > 0) {
			// 删除历史通知
			for (ThreeSale saleExpire : listExpire) {
			msgInviteDetailService.deleteByThreeSale(saleExpire);
			}
			// 删除已失效关系
			threeSaleMapper.deleteExpireRecord(inviter.getId(), worker.getId());
			}

			} else {
			// 还存在有效的邀请，则不做处理
			}
			@@ -233,62 +216,25 @@
			}

			@Override
			public long getFirstUsersCount(Long uid) {
			return threeSaleMapper.countFirstTeam(uid, null);
			}

			@Override
			public long getSecondUsersCount(Long uid) {
			return threeSaleMapper.countSecondTeam(uid, null);
			}

			@Override
			public List<ThreeSale> queryMyFirstTeamList(int start, int count, String key, Long bossId) {
			return threeSaleMapper.queryMyFirstTeamList(start, count, key, bossId);
			}

			@Override
			public long queryCountMyFirstTeamList(String key, Long bossId) {
			return threeSaleMapper.queryCountMyFirstTeamList(key, bossId);
			}

			@Override
			public List<ThreeSale> queryMySecondTeamList(int start, int count, String key, Long bossId) {
			return threeSaleMapper.queryMySecondTeamList(start, count, key, bossId);
			}

			@Override
			public long queryCountMySecondTeamList(String key, Long bossId) {
			return threeSaleMapper.queryCountMySecondTeamList(key, bossId);
			}

			@Override
			public int deleteByPrimaryKey(Long id) {
			return threeSaleMapper.deleteByPrimaryKey(id);
			}



			@Override
			public List<ThreeSale> listFirstTeamQuery(long start, int count, Long uid, Integer state, String startTime,
			String endTime) {
			return threeSaleMapper.listFirstTeamQuery(start, count, uid, state, startTime, endTime);
			String endTime, Integer validState) {
			return threeSaleMapper.listFirstTeamQuery(start, count, uid, state, startTime, endTime, validState);
			}

			@Override
			public long countFirstTeamQuery(Long uid, Integer state, String startTime, String endTime) {
			return threeSaleMapper.countFirstTeamQuery(uid, state, startTime, endTime);
			public long countFirstTeamQuery(Long uid, Integer state, String startTime, String endTime, Integer validState) {
			return threeSaleMapper.countFirstTeamQuery(uid, state, startTime, endTime, validState);
			}

			@Override
			public List<ThreeSale> listSecondTeamQuery(long start, int count, Long uid, Integer state, String startTime,
			String endTime) {
			return threeSaleMapper.listSecondTeamQuery(start, count, uid, state, startTime, endTime);
			String endTime, Integer validState) {
			return threeSaleMapper.listSecondTeamQuery(start, count, uid, state, startTime, endTime, validState);
			}

			@Override
			public long countSecondTeamQuery(Long uid, Integer state, String startTime, String endTime) {
			return threeSaleMapper.countSecondTeamQuery(uid, state, startTime, endTime);
			public long countSecondTeamQuery(Long uid, Integer state, String startTime, String endTime, Integer validState) {
			return threeSaleMapper.countSecondTeamQuery(uid, state, startTime, endTime, validState);
			}

			@Override
			@@ -299,16 +245,6 @@
			@Override
			public long countSuperiorQuery(Integer state, Long uid) {
			return threeSaleMapper.countSuperiorQuery(state, uid);
			}

			@Override
			public long countFirstTeam(Long uid, Integer state) {
			return threeSaleMapper.countFirstTeam(uid, state);
			}

			@Override
			public long countSecondTeam(Long uid, Integer state) {
			return threeSaleMapper.countSecondTeam(uid, state);
			}

			@Override
			@@ -327,27 +263,22 @@
			}

			@Override
			public JSONObject getMyFirstTeam(long start, int count, Long uid, Integer state) {

			List<ThreeSale> list = threeSaleMapper.listFirstTeam(start, count, uid, state);
			public JSONObject getMyFirstTeam(long start, int count, Long uid) {
			List<ThreeSale> list = threeSaleMapper.listFirstTeam(start, count, uid, null);
			if (list == null) {
			list = new ArrayList<ThreeSale>();
			}

			long countTotal = threeSaleMapper.countFirstTeam(uid, state);

			long countTotal = threeSaleMapper.countFirstTeam(uid, null);
			return organizeTeam(countTotal, list);
			}

			@Override
			public JSONObject getMySecondTeam(long start, int count, Long uid, Integer state) {
			List<ThreeSale> list = threeSaleMapper.listSecondTeam(start, count, uid, state);
			public JSONObject getMySecondTeam(long start, int count, Long uid) {
			List<ThreeSale> list = threeSaleMapper.listSecondTeam(start, count, uid, null);
			if (list == null) {
			list = new ArrayList<ThreeSale>();
			}

			long countTotal = threeSaleMapper.countSecondTeam(uid, state);

			long countTotal = threeSaleMapper.countSecondTeam(uid, null);
			return organizeTeam(countTotal, list);
			}

			@@ -476,13 +407,12 @@
			return threeSaleMapper.getSuccessRelationshipNum(uid);
			}


			@Override
			@Transactional(rollbackFor = Exception.class)
			public void bindInviteRelationship(Long workerId, Long bossId) throws ThreeSaleException {
			if (workerId == null \|\| bossId == null)
			throw new ThreeSaleException(1, "用户信息为空");


			// 新建立确定关系
			ThreeSale threeSale = new ThreeSale();
			threeSale.setBoss(new UserInfo(bossId));
			@@ -503,9 +433,14 @@
			*/
			@Transactional
			private void inviteSuccess(Long workerId, Long bossId) {
			// 同步粉丝消息
			teamFansInfoService.addFansInfo(workerId, bossId, new Date());

			if (!Constant.IS_TEST) {
			UserInviteMQMsg msg = new UserInviteMQMsg(bossId, workerId, null, new Date(), UserInviteMQMsg.STATE_SUCCESS);
			UserInviteMQMsg msg = new UserInviteMQMsg(bossId, workerId, null, new Date(),
			UserInviteMQMsg.STATE_SUCCESS);
			Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteSuccess, msg);
			message.setStartDeliverTime(java.lang.System.currentTimeMillis() + 5000);
			producer.send(message);
			}

			@@ -515,24 +450,25 @@
			try { // 邀请金币
			integralGetService.addInviteLevelOne(bossId, workerId);
			} catch (Exception e) {
			e.printStackTrace();
			LogHelper.error(e);
			}

			// 邀请成功消息
			try {
			// 直接粉丝邀请成功
			UserInfo invitee = userInfoService.selectByPKey(workerId);
			userInviteMsgNotificationService.directInviteSuccess(bossId, invitee.getNickName(),
			invitee.getPortrait(), new Date());


			// 间接粉丝邀请成功
			ThreeSale myBoss = threeSaleMapper.getMyBoss(bossId);
			if (myBoss != null) {
			UserInfo boss = userInfoService.selectByPKey(bossId);
			userInviteMsgNotificationService.indirectInviteSuccess(myBoss.getBoss().getId(),
			boss.getNickName(), invitee.getNickName(), invitee.getPortrait(), new Date());
			userInviteMsgNotificationService.indirectInviteSuccess(myBoss.getBoss().getId(),
			boss.getNickName(), invitee.getNickName(), invitee.getPortrait(), new Date());
			}
			} catch (Exception e) {
			e.printStackTrace();
			LogHelper.error(e);
			}
			}
			});
			@@ -547,11 +483,6 @@
			@Override
			public ThreeSale getByWorkerId(Long workerId) {
			return threeSaleMapper.getByWorkerId(workerId);
			}

			@Override
			public long countSuccessFirstTeam(Long uid) {
			return threeSaleMapper.countFirstTeam(uid, 1);
			}

			@Override
			@@ -570,33 +501,53 @@
			}

			@Override
			public List<ThreeSale> listFirstTeam(long start, int count, Long uid, Integer state) {
			return threeSaleMapper.listFirstTeam(start, count, uid, state);
			public List<ThreeSale> listFirstTeam(long start, int count, Long uid) {
			return threeSaleMapper.listFirstTeam(start, count, uid, null);
			}

			@Override
			public List<ThreeSale> listFirstTeamByUndeleted(long start, int count, Long uid) {
			return threeSaleMapper.listFirstTeamByUndeleted(start, count, uid);
			public List<ThreeSale> listSecondTeam(long start, int count, Long uid) {
			return threeSaleMapper.listSecondTeam(start, count, uid, null);
			}

			@Override
			public long countFirstTeamByUndeleted(Long uid) {
			return threeSaleMapper.countFirstTeamByUndeleted(uid);
			public List<ThreeSale> listFirstTeam(long start, int count, Long uid, List<Long> listId) {
			return threeSaleMapper.listFirstTeam(start, count, uid, listId);
			}

			@Override
			public List<ThreeSale> listSecondTeamByUndeleted(long start, int count, Long uid) {
			return threeSaleMapper.listSecondTeamByUndeleted(start, count, uid);
			public List<ThreeSale> listSecondTeam(long start, int count, Long uid, List<Long> listId) {
			return threeSaleMapper.listSecondTeam(start, count, uid, listId);
			}

			@Override
			public long countSecondTeamByUndeleted(Long uid) {
			return threeSaleMapper.countSecondTeamByUndeleted(uid);
			public long countFirstTeam(Long uid) {
			return threeSaleMapper.countFirstTeam(uid, null);
			}

			@Override
			public List<ThreeSale> listSecondTeam(long start, int count, Long uid, Integer state) {
			return threeSaleMapper.listSecondTeam(start, count, uid, state);
			public long countSecondTeam(Long uid) {
			return threeSaleMapper.countSecondTeam(uid, null);
			}

			@Override
			public long countFirstTeam(Long uid, List<Long> listId) {
			return threeSaleMapper.countFirstTeam(uid, listId);
			}

			@Override
			public long countSecondTeam(Long uid, List<Long> listId) {
			return threeSaleMapper.countSecondTeam(uid, listId);
			}

			@Override
			public long countFirstTeamByDate(Long uid, int dayType) {
			return threeSaleMapper.countFirstTeamByDate(uid, dayType);
			}

			@Override
			public long countSecondTeamByDate(Long uid, int dayType) {
			return threeSaleMapper.countSecondTeamByDate(uid, dayType);
			}

			@Override
			@@ -640,48 +591,37 @@

			@Override
			public List<ThreeSale> getMyBossDeepList(Long uid) {
			//TODO 需要更加简便的方式处理
			// TODO 需要更加简便的方式处理
			return getMyBossDeepList(uid, 100);
			}

			@Override
			public void remvoeBreak(Long id, Long uid, Long tid) {
			ThreeSale threeSale = threeSaleMapper.selectByPrimaryKey(id);
			if (threeSale == null) {
			return;
			public Long getTopBoss(Long uid) {
			Long bossUid = null;
			UserInfo boss = getBoss(uid);
			while (boss != null) {
			bossUid = boss.getId();
			boss = getBoss(boss.getId());
			}
			return bossUid;
			}

			Long workerId = threeSale.getWorker().getId();
			if (tid.longValue() != workerId.longValue()) {
			return;
			}
			@Override
			public List<ThreeSale> listAll(Date minTime, Date maxTime, int page, int pageSize) {
			return threeSaleMapper.listAll(minTime == null ? null : minTime.getTime(),
			maxTime == null ? null : maxTime.getTime(), (page - 1) * pageSize, pageSize);
			}

			Integer expire = threeSale.getExpire();
			if (expire == ThreeSale.EXPIRE_NORMAL) {
			return;
			}
			@Override
			public long countAll(Date minTime, Date maxTime) {
			return threeSaleMapper.countAll(minTime == null ? null : minTime.getTime(),
			maxTime == null ? null : maxTime.getTime());
			}

			int upExpire = expire;
			Long bossId = threeSale.getBoss().getId();
			if (bossId.longValue() == uid.longValue()) { // 直接粉丝
			if (expire == ThreeSale.EXPIRE_BREAK_VIP_DEL4) {
			upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL34;
			} else {
			upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL3;
			}
			} else { // 间接粉丝
			if (expire == ThreeSale.EXPIRE_BREAK_VIP_DEL3) {
			upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL34;
			} else {
			upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL4;
			}
			}

			ThreeSale update = new ThreeSale();
			update.setId(id);
			update.setExpire(upExpire);
			update.setUpdateTime(java.lang.System.currentTimeMillis());
			threeSaleMapper.updateByPrimaryKeySelective(update);

			@Override
			public List<Long> getAllBossId(){
			return threeSaleMapper.getAllBossId();
			}

			}