From 2ec42a5aacea35d2918f0e17f07685cf5b4d25c8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:20:41 +0800
Subject: [PATCH] 包名引用路径更改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 211 ++++++++++++++++++++++++++++++----------------------
1 files changed, 123 insertions(+), 88 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
index a30f7bc..ff5e5ab 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
@@ -23,17 +23,16 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;
import com.yeshi.fanli.entity.bus.msg.UserSystemMsgTypeEnum;
+import com.yeshi.fanli.entity.bus.user.TeamFansInfo;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
-import com.yeshi.fanli.entity.bus.user.ThreeSaleFocusInfo;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserInviteValidNum;
import com.yeshi.fanli.entity.bus.user.UserInviteValidRecord;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
-import com.yeshi.fanli.entity.bus.user.vip.TeamDailyRecord;
-import com.yeshi.fanli.entity.bus.user.vip.TeamLevelDailyRecord;
+import com.yeshi.fanli.entity.bus.user.invite.TeamDailyRecord;
import com.yeshi.fanli.entity.bus.user.vip.TeamUserLevelStatistic;
import com.yeshi.fanli.entity.bus.user.vip.TearcherInfo;
import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
@@ -54,15 +53,14 @@
import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.invite.TeamDailyRecordService;
+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.ThreeSaleFocusInfoService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.invite.UserInviteService;
import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;
import com.yeshi.fanli.service.inter.user.invite.UserInviteValidRecordService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
-import com.yeshi.fanli.service.inter.user.vip.TeamDailyRecordService;
-import com.yeshi.fanli.service.inter.user.vip.TeamLevelDailyRecordService;
import com.yeshi.fanli.service.inter.user.vip.TeamUserLevelStatisticService;
import com.yeshi.fanli.service.inter.user.vip.TearcherService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
@@ -136,7 +134,7 @@
private CommonOrderCountService commonOrderCountService;
@Resource
- private ThreeSaleFocusInfoService threeSaleFocusInfoService;
+ private TeamFansInfoService teamFansInfoService;
@Resource
private UserCustomSettingsService userCustomSettingsService;
@@ -150,9 +148,6 @@
@Resource
private UserVIPPreInfoService userVIPPreInfoService;
- @Resource
- private TeamLevelDailyRecordService teamLevelDailyRecordService;
-
@Resource
private TeamDailyRecordService teamDailyRecordService;
@@ -864,11 +859,11 @@
countSecond = threeSaleSerivce.countSecondTeam(uid);
} else { // 绛涢�夋潯浠�
List<Long> listId = null;
- List<ThreeSaleFocusInfo> listfocus = threeSaleFocusInfoService.query((page - 1) * Constant.PAGE_SIZE,
+ List<TeamFansInfo> listfocus = teamFansInfoService.query((page - 1) * Constant.PAGE_SIZE,
Constant.PAGE_SIZE, type, uid, focus);
if (listfocus != null && listfocus.size() > 0) {
listId = new ArrayList<Long>();
- for (ThreeSaleFocusInfo focusInfo : listfocus) {
+ for (TeamFansInfo focusInfo : listfocus) {
listId.add(focusInfo.getWorkerId());
}
}
@@ -880,8 +875,8 @@
listTeam = threeSaleSerivce.listSecondTeam(0, Constant.PAGE_SIZE, uid, listId);
}
}
- firstTeam = threeSaleFocusInfoService.count(1, uid, focus);
- countSecond = threeSaleFocusInfoService.count(2, uid, focus);
+ firstTeam = teamFansInfoService.count(1, uid, focus);
+ countSecond = teamFansInfoService.count(2, uid, focus);
}
JSONArray array = organizeTeamNew(acceptData, listTeam, uid, type, true);
@@ -892,6 +887,11 @@
result.put("secondTeam", countSecond);
result.put("count", count);
result.put("list", array);
+
+ // 缁熻H5閾炬帴
+ if (page == 1) {
+ result.put("link", configService.get(ConfigKeyEnum.teamStatisticsLink.getKey()));
+ }
out.print(JsonUtil.loadTrueResult(result));
}
@@ -917,8 +917,8 @@
* @param id
* @param out
*/
- @RequestMapping(value = "countMyTeamV2", method = RequestMethod.POST)
- public void countMyTeamV2(AcceptData acceptData, Long uid, PrintWriter out) {
+ @RequestMapping(value = "countMyTeamV2")
+ public void countMyTeamV2(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
try {
JSONObject bossObject = new JSONObject();
ThreeSale threeSale = threeSaleSerivce.getByWorkerId(uid);
@@ -976,8 +976,7 @@
tearcherObject.put("phone", tearcherInfo.getPhone());
tearcherObject.put("weixin", tearcherInfo.getWxID());
tearcherObject.put("level", UserLevelEnum.tearcher);
-
- json.put("tearcher", tearcherInfo);
+ json.put("tearcher", tearcherObject);
}
JSONObject daren = new JSONObject();
@@ -996,54 +995,82 @@
highVIP.put("total", statistic.getHighFirstCount() + statistic.getHighSecondCount());
superVIP.put("total", statistic.getSuperFirstCount() + statistic.getSuperSecondCount());
}
- // 缁熻杈句汉
- long darenToday = threeSaleSerivce.countFirstTeamByDate(uid, 1) + threeSaleSerivce.countSecondTeamByDate(uid, 1);
- long darenMonth = threeSaleSerivce.countFirstTeamByDate(uid, 2) + threeSaleSerivce.countSecondTeamByDate(uid, 2);
+
+
+ int darenToday = 0;
+ int highVIPToday = 0;
+ int superVIPToday = 0;
+ String createId = teamDailyRecordService.createId(uid, new Date());
+ TeamDailyRecord record = teamDailyRecordService.getById(createId);
+ if (record != null) {
+ if (record.getFirstDaRen() != null)
+ darenToday += record.getFirstDaRen();
+ if (record.getSecondDaRen() != null)
+ darenToday += record.getSecondDaRen();
+ if (record.getFirstHighVIP() != null)
+ highVIPToday += record.getFirstHighVIP();
+ if (record.getSecondHighVIP() != null)
+ highVIPToday += record.getSecondHighVIP();
+ if (record.getFirstSuperVIP() != null)
+ superVIPToday += record.getFirstSuperVIP();
+ if (record.getSecondSuperVIP() != null)
+ superVIPToday += record.getSecondSuperVIP();
+ }
+
+
+ // 鑾峰彇褰撴湀绗竴澶╁拰鏈�鍚庝竴澶�
+ Calendar cale = Calendar.getInstance();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ String firstday, lastday;
+ // 鑾峰彇鍓嶆湀鐨勭涓�澶�
+ cale = Calendar.getInstance();
+ cale.add(Calendar.MONTH, 0);
+ cale.set(Calendar.DAY_OF_MONTH, 1);
+ firstday = format.format(cale.getTime());
+ // 鑾峰彇鍓嶆湀鐨勬渶鍚庝竴澶�
+ cale = Calendar.getInstance();
+ cale.add(Calendar.MONTH, 1);
+ cale.set(Calendar.DAY_OF_MONTH, 0);
+ lastday = format.format(cale.getTime());
+
+ int darenMonth = 0;
+ int highVIPMonth = 0;
+ int superVIPMonth = 0;
+ Date date = new Date();
+ Date minTime = TimeUtil.parseYYYYMMDD(firstday);
+ Date maxTime = TimeUtil.parseYYYYMMDD_HHMMSS(lastday + " 23:59:59");
+ List<TeamDailyRecord> listMonth = teamDailyRecordService.sumGroupByYearMonth(uid, minTime, maxTime);
+ if (listMonth != null && listMonth.size() > 0) {
+ TeamDailyRecord teamRecord = listMonth.get(0);
+ if (teamRecord.getFirstDaRen() != null)
+ darenMonth += teamRecord.getFirstDaRen();
+ if (teamRecord.getSecondDaRen() != null)
+ darenMonth += teamRecord.getSecondDaRen();
+ if (teamRecord.getFirstHighVIP() != null)
+ highVIPMonth += teamRecord.getFirstHighVIP();
+ if (teamRecord.getSecondHighVIP() != null)
+ highVIPMonth += teamRecord.getSecondHighVIP();
+ if (teamRecord.getFirstSuperVIP() != null)
+ superVIPMonth += teamRecord.getFirstSuperVIP();
+ if (teamRecord.getSecondSuperVIP() != null)
+ superVIPMonth += teamRecord.getSecondSuperVIP();
+ }
+ // 杈句汉
daren.put("today", darenToday);
daren.put("month", darenMonth);
-
- SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
- String today = sd.format(new Date());
- // 褰撴湀1鍙�
- Calendar calendar1 = Calendar.getInstance();
- calendar1.set(Calendar.DAY_OF_MONTH, 1);
- Date minTime = sd.parse(sd.format(calendar1.getTime()));
-
- int highVIPToday = 0;
- int highVIPMonth = 0;
- List<TeamLevelDailyRecord> list = teamLevelDailyRecordService.getbyUidAndType(uid, UserLevelEnum.highVIP, minTime);
- if (list == null || list.size() > 0) {
- for (TeamLevelDailyRecord record: list) {
- if (today.equals(sd.format(record.getUpdateTime()))) {
- highVIPToday = record.getFirstCount() + record.getSecondCount();
- }
- highVIPMonth = highVIPMonth + record.getFirstCount() + record.getSecondCount();
- }
- }
+ // 楂樼骇浼氫細鍛�
highVIP.put("today", highVIPToday);
highVIP.put("month", highVIPMonth);
-
-
- int superVIPToday = 0;
- int superVIPMonth = 0;
- List<TeamLevelDailyRecord> listSuper = teamLevelDailyRecordService.getbyUidAndType(uid, UserLevelEnum.superVIP, minTime);
- if (listSuper == null || listSuper.size() > 0) {
- for (TeamLevelDailyRecord record: listSuper) {
- if (today.equals(sd.format(record.getUpdateTime()))) {
- superVIPToday = record.getFirstCount() + record.getSecondCount();
- }
- superVIPMonth = superVIPMonth + record.getFirstCount() + record.getSecondCount();
- }
- }
+ // 缁熻瓒呯骇浼氬憳鏁伴噺
superVIP.put("today", superVIPToday);
superVIP.put("month", superVIPMonth);
json.put("daren", daren);
json.put("highVIP", highVIP);
json.put("superVIP", superVIP);
- out.print(JsonUtil.loadTrueResult(json));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(json));
} catch (Exception e) {
- out.print(JsonUtil.loadFalseResult("缁熻澶辫触"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("缁熻澶辫触"));
e.printStackTrace();
}
@@ -1076,6 +1103,10 @@
return;
}
+ // 涓婄骇
+ UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());
+
+
JSONArray tagArray = new JSONArray();
String memoName = user.getNickName();
Long succeedTime = threeSale.getSucceedTime();
@@ -1092,6 +1123,7 @@
}
}
+ data.put("bossNickName", boss.getNickName());
data.put("nickName", user.getNickName());
data.put("phone", phone);
data.put("phoneCopy", phoneCopy);
@@ -1117,8 +1149,13 @@
weixin = userInfoExtra.getWeiXin();
activeTime = userInfoExtra.getActiveTime();
}
+
+ if (activeTime == null) {
+ activeTime = new Date(user.getCreatetime());
+ }
+
data.put("weixin", StringUtil.isNullOrEmpty(weixin) ? "" : weixin);
- data.put("loginTime", TimeUtil.formatDate(activeTime == null ? userInfoExtra.getCreateTime() : activeTime));
+ data.put("loginTime", TimeUtil.formatDate(activeTime));
UserExtraTaoBaoInfo userExtraTaoBaoInfo = userExtraTaoBaoInfoService.getByUid(workerId);
if (userExtraTaoBaoInfo != null && !StringUtil.isNullOrEmpty(userExtraTaoBaoInfo.getRelationId())
@@ -1156,21 +1193,19 @@
}
data.put("level", levelName);
+ // 绮変笣缁熻
long indirectNum = 0;
long directNum = threeSaleSerivce.countFirstTeam(workerId);
if (directNum > 0) {
indirectNum = threeSaleSerivce.countSecondTeam(workerId);
}
- data.put("directNum", directNum);
- data.put("indirectNum", indirectNum);
-
+ // 璁㈠崟缁熻
long countTB = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_TAOBAO, 60);
long countJD = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_JD, 60);
long countPDD = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_PDD, 60);
- data.put("orderTB", countTB);
- data.put("orderJD", countJD);
- data.put("orderPDD", countPDD);
+ data.put("fansNum", "鐩存帴绮変笣锛� "+directNum+"浜篭n" + "闂存帴绮変笣锛� "+indirectNum+"浜�");
+ data.put("orderInfo", "娣樺疂 ("+countTB+"绗�)\n" + "浜笢 ("+countJD+"绗�)\n" + "鎷煎澶� ("+countPDD+"绗�)");
out.print(JsonUtil.loadTrueResult(data));
}
@@ -1212,7 +1247,7 @@
threeSaleExtraInfoSerivce.insertSelective(saleExtraInfo);
}
- threeSaleFocusInfoService.updateTags(workerId, type, tags);
+ teamFansInfoService.updateTags(workerId, type, tags);
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
}
@@ -1225,8 +1260,8 @@
* @param id
* @param out
*/
- @RequestMapping(value = "countTeamH5", method = RequestMethod.POST)
- public void countTeamH5(AcceptData acceptData, Long uid, PrintWriter out) {
+ @RequestMapping(value = "countTeamH5")
+ public void countTeamH5(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
try {
Date now = new Date();
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM");
@@ -1243,50 +1278,50 @@
TeamDailyRecord monthRecord = new TeamDailyRecord(0,0,0);
TeamDailyRecord totalityRecord = new TeamDailyRecord(0,0,0);
- List<TeamDailyRecord> list = teamDailyRecordService.getbyUid(uid);
+ List<TeamDailyRecord> list = teamDailyRecordService.getByUid(uid);
if (list != null && list.size() > 0) {
for (TeamDailyRecord record: list) {
- Date statisticDay = record.getStatisticDay();
+ Date statisticDay = record.getCountDay();
if (todayStr.equals(sdf.format(statisticDay))) {
todayRecord = record;
}
- if (reduceDay.equals(sdf.format(statisticDay))) {
+ if (sdf.format(reduceDay).equals(sdf.format(statisticDay))) {
yesterdayRecord = record;
}
if (monthStr.equals(sdf1.format(statisticDay))) {
- monthRecord.setFirstCount(monthRecord.getFirstCount() + record.getFirstCount());
- monthRecord.setSecondCount(monthRecord.getSecondCount() + record.getSecondCount());
- monthRecord.setSecondBeyond(monthRecord.getSecondBeyond() + record.getSecondBeyond());
+ monthRecord.setFirstNum(monthRecord.getFirstNum() + record.getFirstNum());
+ monthRecord.setSecondNum(monthRecord.getSecondNum() + record.getSecondNum());
+ monthRecord.setBeyondNum(monthRecord.getBeyondNum() + record.getBeyondNum());
}
- totalityRecord.setFirstCount(totalityRecord.getFirstCount() + record.getFirstCount());
- totalityRecord.setSecondCount(totalityRecord.getSecondCount() + record.getSecondCount());
- totalityRecord.setSecondBeyond(totalityRecord.getSecondBeyond() + record.getSecondBeyond());
+ totalityRecord.setFirstNum(totalityRecord.getFirstNum() + record.getFirstNum());
+ totalityRecord.setSecondNum(totalityRecord.getSecondNum() + record.getSecondNum());
+ totalityRecord.setBeyondNum(totalityRecord.getBeyondNum() + record.getBeyondNum());
}
}
JSONObject today = new JSONObject();
- today.put("direct", todayRecord.getFirstCount());
- today.put("indirect", todayRecord.getSecondCount());
- today.put("beyond", todayRecord.getSecondBeyond());
+ today.put("direct", todayRecord.getFirstNum());
+ today.put("indirect", todayRecord.getSecondNum());
+ today.put("beyond", todayRecord.getBeyondNum());
JSONObject yesterday = new JSONObject();
- yesterday.put("direct", yesterdayRecord.getFirstCount());
- yesterday.put("indirect", yesterdayRecord.getSecondCount());
- yesterday.put("beyond", yesterdayRecord.getSecondBeyond());
+ yesterday.put("direct", yesterdayRecord.getFirstNum());
+ yesterday.put("indirect", yesterdayRecord.getSecondNum());
+ yesterday.put("beyond", yesterdayRecord.getBeyondNum());
JSONObject month = new JSONObject();
- month.put("direct", monthRecord.getFirstCount());
- month.put("indirect", monthRecord.getSecondCount());
- month.put("beyond", monthRecord.getSecondBeyond());
+ month.put("direct", monthRecord.getFirstNum());
+ month.put("indirect", monthRecord.getSecondNum());
+ month.put("beyond", monthRecord.getBeyondNum());
JSONObject totality = new JSONObject();
- totality.put("direct", totalityRecord.getFirstCount());
- totality.put("indirect", totalityRecord.getSecondCount());
- totality.put("beyond", totalityRecord.getSecondBeyond());
+ totality.put("direct", totalityRecord.getFirstNum());
+ totality.put("indirect", totalityRecord.getSecondNum());
+ totality.put("beyond", totalityRecord.getBeyondNum());
JSONObject json = new JSONObject();
@@ -1294,9 +1329,9 @@
json.put("yesterday", yesterday);
json.put("month", month);
json.put("totality", totality);
- out.print(JsonUtil.loadTrueResult(json));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(json));
} catch (Exception e) {
- out.print(JsonUtil.loadFalseResult("缁熻澶辫触"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("缁熻澶辫触"));
e.printStackTrace();
}
--
Gitblit v1.8.0