From fb885c8bff26484f2bb21e697f182cc35bc4fa63 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 12 五月 2020 15:27:08 +0800
Subject: [PATCH] 2.1.1 新需求
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 86 +++++++++++++++++-------------------------
1 files changed, 35 insertions(+), 51 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 21596a0..7b497eb 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,9 +23,9 @@
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;
@@ -33,7 +33,6 @@
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.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.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);
@@ -1015,30 +1010,14 @@
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();
- }
- }
+ // TODO 缁熻楂樼骇浼氬憳鏁伴噺
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);
@@ -1080,6 +1059,10 @@
return;
}
+ // 涓婄骇
+ UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());
+
+
JSONArray tagArray = new JSONArray();
String memoName = user.getNickName();
Long succeedTime = threeSale.getSucceedTime();
@@ -1096,6 +1079,7 @@
}
}
+ data.put("bossNickName", boss.getNickName());
data.put("nickName", user.getNickName());
data.put("phone", phone);
data.put("phoneCopy", phoneCopy);
@@ -1219,7 +1203,7 @@
threeSaleExtraInfoSerivce.insertSelective(saleExtraInfo);
}
- threeSaleFocusInfoService.updateTags(workerId, type, tags);
+ teamFansInfoService.updateTags(workerId, type, tags);
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
}
@@ -1253,47 +1237,47 @@
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();
--
Gitblit v1.8.0