fanli-server.git

			@@ -1174,13 +1174,11 @@
			data.put("taobao", false);
			}

			String levelName = null;
			UserVIPPreInfo userVIPPreInfo = userVIPPreInfoService.getLatestProcessInfo(workerId);
			if (userVIPPreInfo != null) {
			String levelName = null;
			Integer process = userVIPPreInfo.getProcess();
			if (process == UserVIPPreInfo.PROCESS_1) {
			levelName = "快省达人";
			} else if (process == UserVIPPreInfo.PROCESS_2) {
			if (process == UserVIPPreInfo.PROCESS_2) {
			levelName = "高级会员";
			} else if (process == UserVIPPreInfo.PROCESS_3) {
			levelName = "超级会员";
			@@ -1189,18 +1187,14 @@
			}

			Integer sourceType = userVIPPreInfo.getSourceType();
			if (sourceType != null) {
			if (sourceType != null && levelName != null) {
			if (sourceType == UserVIPPreInfo.SOURCE_TYPE_ORDER) {
			levelName += "(自购分享型)";
			} else {
			levelName += "(邀请团队型)";
			data.put("level", levelName += "(自购分享型)");
			} else if (sourceType == UserVIPPreInfo.SOURCE_TYPE_TEAM) {
			data.put("level", levelName += "(邀请团队型)");
			}
			}
			}
			if (StringUtil.isNullOrEmpty(levelName)) {
			levelName = "快省达人";
			}
			data.put("level", levelName);

			// 粉丝统计
			long indirectNum = 0;
			@@ -1263,56 +1257,45 @@
			}



			/**
			* 用户队员统计-h5
			* 队员数量统计
			*
			* @param acceptData
			* @param id
			* @param out
			*/
			@RequestMapping(value = "countTeamH5")
			public void countTeamH5(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
			@RequestMapping(value = "countTeamNum")
			public void countTeamNum(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
			try {
			Date now = new Date();
			SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM");
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
			// 今日
			String todayStr = sdf.format(now);
			// 昨日
			Date reduceDay = DateUtil.reduceDay(1, now);
			// 本月
			String monthStr = sdf1.format(now);

			TeamDailyRecord todayRecord = new TeamDailyRecord(0,0,0);
			TeamDailyRecord yesterdayRecord = new TeamDailyRecord(0,0,0);
			TeamDailyRecord monthRecord = new TeamDailyRecord(0,0,0);
			TeamDailyRecord totalityRecord = new TeamDailyRecord(0,0,0);
			Date minDate = null;
			Date maxDate = null;
			long timeStamp = System.currentTimeMillis();

			List<TeamDailyRecord> list = teamDailyRecordService.getByUid(uid);
			if (list != null && list.size() > 0) {
			for (TeamDailyRecord record: list) {
			Date statisticDay = record.getCountDay();
			if (todayStr.equals(sdf.format(statisticDay))) {
			todayRecord = record;
			}

			if (sdf.format(reduceDay).equals(sdf.format(statisticDay))) {
			yesterdayRecord = record;
			}

			if (monthStr.equals(sdf1.format(statisticDay))) {
			monthRecord.setFirstNum(monthRecord.getFirstNum() + record.getFirstNum());
			monthRecord.setSecondNum(monthRecord.getSecondNum() + record.getSecondNum());
			monthRecord.setBeyondNum(monthRecord.getBeyondNum() + record.getBeyondNum());
			}

			totalityRecord.setFirstNum(totalityRecord.getFirstNum() + record.getFirstNum());
			totalityRecord.setSecondNum(totalityRecord.getSecondNum() + record.getSecondNum());
			totalityRecord.setBeyondNum(totalityRecord.getBeyondNum() + record.getBeyondNum());
			}
			}
			Calendar calendar = Calendar.getInstance();
			calendar.setTimeInMillis(timeStamp);

			// 今日预估
			calendar.add(Calendar.DAY_OF_YEAR, -1);
			minDate = new Date(TimeUtil.convertDateToTemp(TimeUtil.getGernalTime(timeStamp)));
			TeamDailyRecord todayRecord = createVO(teamDailyRecordService.sumTeamNumGroupByCountDay(uid, minDate, null));

			// 昨日预估
			calendar.add(Calendar.DAY_OF_YEAR, -1);
			maxDate = new Date(TimeUtil.convertDateToTemp(TimeUtil.getGernalTime(timeStamp)));
			minDate = DateUtil.reduceDay(1, maxDate);
			TeamDailyRecord yesterdayRecord = createVO(teamDailyRecordService.sumTeamNumGroupByCountDay(uid, minDate, maxDate));

			// 本月预估
			maxDate = new Date(timeStamp);
			calendar = Calendar.getInstance();
			minDate = new Date(TimeUtil
			.convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));
			calendar.add(Calendar.MONTH, -1);
			TeamDailyRecord monthRecord = createVO(teamDailyRecordService.sumTeamNumGroupByYearMonth(uid, minDate, maxDate));

			// 累计
			TeamDailyRecord totalityRecord = createVO(teamDailyRecordService.sumTeamNumGroupByUid(uid, null, null));

			JSONObject today = new JSONObject();
			today.put("direct", todayRecord.getFirstNum());
			@@ -1345,6 +1328,20 @@
			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("统计失败"));
			e.printStackTrace();
			}

			}


			private TeamDailyRecord createVO(List<TeamDailyRecord> list) {
			TeamDailyRecord totalityRecord = new TeamDailyRecord(0,0,0);
			if (list != null && list.size() > 0) {
			for (TeamDailyRecord record: list) {
			totalityRecord.setFirstNum(totalityRecord.getFirstNum() + record.getFirstNum());
			totalityRecord.setSecondNum(totalityRecord.getSecondNum() + record.getSecondNum());
			totalityRecord.setBeyondNum(totalityRecord.getBeyondNum() + record.getBeyondNum());
			}
			}
			return totalityRecord;
			}


			}