fanli-server.git

			@@ -611,23 +611,22 @@
			public List<ThreeSale> listFirstTeamByUndeleted(long start, int count, Long uid) {
			return threeSaleMapper.listFirstTeamByUndeleted(start, count, uid);
			}


			@Override
			public long countFirstTeamByUndeleted(Long uid) {
			return threeSaleMapper.countFirstTeamByUndeleted(uid);
			}


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


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



			@Override
			public List<ThreeSale> listSecondTeam(long start, int count, Long uid, Integer state) {
			return threeSaleMapper.listSecondTeam(start, count, uid, state);
			@@ -671,8 +670,12 @@

			return deepList;
			}



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

			@Override
			public void remvoeBreak(Long id, Long uid, Long tid) {
			@@ -680,33 +683,33 @@
			if (threeSale == null) {
			return;
			}


			Long workerId = threeSale.getWorker().getId();
			if (tid.longValue() != workerId.longValue()) {
			return;
			}


			Integer expire = threeSale.getExpire();
			if (expire == ThreeSale.EXPIRE_NORMAL) {
			return;
			}


			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;
			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;
			upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL34;
			} else {
			upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL4;
			}
			}


			ThreeSale update = new ThreeSale();
			update.setId(id);
			update.setExpire(upExpire);