fanli-server.git

			@@ -1107,7 +1107,6 @@
			// 上级
			UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());


			JSONArray tagArray = new JSONArray();
			String memoName = user.getNickName();
			Long succeedTime = threeSale.getSucceedTime();
			@@ -1200,6 +1199,7 @@
			if (directNum > 0) {
			indirectNum = threeSaleSerivce.countSecondTeam(workerId);
			}

			// 订单统计
			long countTB = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_TAOBAO, 60);
			long countJD = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_JD, 60);

			@@ -153,7 +153,7 @@

			if (!StringUtil.isNullOrEmpty(focusDTO.getMinActiveTime())) {
			Date date = TimeUtil.parseDotYYYYMMDD(focusDTO.getMinActiveTime());
			list.add(Criteria.where("joinTime").gte(date));
			list.add(Criteria.where("activeTime").gte(date));
			}

			if (!StringUtil.isNullOrEmpty(focusDTO.getMaxActiveTime())) {

	fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史