From 3b681c9fb373c6f39c8db38e37b4508bd7c3c9e1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 五月 2020 09:33:08 +0800
Subject: [PATCH] 用户订单信息统计
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 100 ++++++++++++++++++++-----------------------------
1 files changed, 41 insertions(+), 59 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
index c7a03b0..3be498e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
@@ -1679,19 +1679,17 @@
JSONObject resultData = new JSONObject();
if (type == 1) {
- resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid, null);
+ resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid);
} else if (type == 2) {
- resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid, null);
+ resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid);
}
// 瀹夊崜绯荤粺杩斿洖鎵�鏈夋暟鎹�
String platform = acceptData.getPlatform();
if ("android".equalsIgnoreCase(platform)) {
- long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
- long firstTeamTotal = threeSaleSerivce.countFirstTeam(uid, null);
+ long firstTeam = threeSaleSerivce.countFirstTeam(uid);
- long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
- long secondTeamTotal = threeSaleSerivce.countSecondTeam(uid, null);
+ long secondTeam = threeSaleSerivce.countSecondTeam(uid);
JSONObject bossData = null;
ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
@@ -1726,9 +1724,9 @@
resultData.put("helpLink", helpLink);
resultData.put("firstTeam", firstTeam);
- resultData.put("firstTeamTotal", firstTeamTotal);
+ resultData.put("firstTeamTotal", firstTeam);
resultData.put("secondTeam", secondTeam);
- resultData.put("secondTeamTotal", secondTeamTotal);
+ resultData.put("secondTeamTotal", secondTeam);
resultData.put("boss", bossData);
}
out.print(JsonUtil.loadTrueResult(resultData));
@@ -1754,17 +1752,17 @@
JSONObject resultData = new JSONObject();
if (type == 1) {
- resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid, 1);
+ resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid);
} else if (type == 2) {
- resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid, 1);
+ resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid);
}
// 瀹夊崜绯荤粺杩斿洖鎵�鏈夋暟鎹�
String platform = acceptData.getPlatform();
if ("android".equalsIgnoreCase(platform)) {
- long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
+ long firstTeam = threeSaleSerivce.countFirstTeam(uid);
- long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
+ long secondTeam = threeSaleSerivce.countSecondTeam(uid);
JSONObject bossData = null;
ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
@@ -1819,11 +1817,9 @@
@RequestMapping(value = "countMyTeam", method = RequestMethod.POST)
public void countMyTeam(AcceptData acceptData, long uid, PrintWriter out) {
try {
- long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
- long firstTeamTotal = threeSaleSerivce.countFirstTeam(uid, null);
+ long firstTeam = threeSaleSerivce.countFirstTeam(uid);
- long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
- long secondTeamTotal = threeSaleSerivce.countSecondTeam(uid, null);
+ long secondTeam = threeSaleSerivce.countSecondTeam(uid);
JSONObject bossData = new JSONObject();
ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
if (threeSale != null) {
@@ -1847,9 +1843,9 @@
}
resultData.put("helpLink", helpLink);
resultData.put("firstTeam", firstTeam);
- resultData.put("firstTeamTotal", firstTeamTotal);
+ resultData.put("firstTeamTotal", firstTeam);
resultData.put("secondTeam", secondTeam);
- resultData.put("secondTeamTotal", secondTeamTotal);
+ resultData.put("secondTeamTotal", secondTeam);
resultData.put("boss", bossData);
boolean hasCode = false;
@@ -1882,21 +1878,28 @@
*/
@RequestMapping(value = "setextrainfo", method = RequestMethod.POST)
public void setExtraInfo(AcceptData acceptData, long uid, long inviteId, String memoName, PrintWriter out) {
- List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null);
- if (listThreeSale == null || listThreeSale.size() == 0) {
+ ThreeSale threeSale = threeSaleSerivce.selectByPrimaryKey(inviteId);
+ if (threeSale == null) {
out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
return;
}
- UserInfo worker = listThreeSale.get(0).getWorker();
+ UserInfo worker = threeSale.getWorker();
if (worker == null) {
out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
return;
}
-
+
ThreeSaleExtraInfo extraInfo = threeSaleExtraInfoSerivce.getbyBossIdAndWorkerId(uid, worker.getId());
if (extraInfo == null) {
extraInfo = new ThreeSaleExtraInfo();
+ Long bossUid = threeSale.getBoss().getId();
+ if (uid == bossUid) {
+ extraInfo.setType(1); // 鐩存帴
+ } else {
+ extraInfo.setType(2); // 闂存帴
+ }
+
extraInfo.setWorker(worker);
extraInfo.setNickname(memoName);
extraInfo.setCreateTime(new Date());
@@ -1913,41 +1916,6 @@
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
}
- /**
- * 鍒犻櫎闃熷憳鍏崇郴
- *
- * @param acceptData
- * @param uid
- * @param inviteId
- * 閭�璇穒d
- * @param out
- */
- @RequestMapping(value = "removethreesale", method = RequestMethod.POST)
- public void removethreesale(AcceptData acceptData, long uid, long inviteId, PrintWriter out) {
- try {
- List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, 1);
- if (listThreeSale == null || listThreeSale.size() == 0) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁鏃犳晥"));
- return;
- }
-
- UserInfo worker = listThreeSale.get(0).getWorker();
- if (worker == null) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁鏃犳晥"));
- return;
- }
-
- // 鍒犻櫎鍏崇郴
- threeSaleSerivce.deleteByPrimaryKey(inviteId);
- // 鍒犻櫎澶囨敞
- threeSaleExtraInfoSerivce.deleteByBossIdAndWorkerId(uid, worker.getId());
-
- out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
- } catch (Exception e) {
- out.print(JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
- e.printStackTrace();
- }
- }
/**
* 璁剧疆鐣岄潰寮�鍏崇姸鎬�
@@ -2129,6 +2097,10 @@
if (mySettings.getNoInvitationBonus() == null) {
mySettings.setNoInvitationBonus(0);
}
+
+ if (mySettings.getNoDisplayPhoneNum() == null) {
+ mySettings.setNoDisplayPhoneNum(0);
+ }
if (mySettings.getOpenSpreadHongBao() == null) {
if (userTaoLiJinDetailService.countDetail(uid) > 0) {
@@ -2222,11 +2194,20 @@
}
if (VersionUtil.greaterThan_2_0_7(acceptData.getPlatform(), acceptData.getVersion())) {
+ UserInviteLevelEnum level = null;
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ level = userInviteService.getUserInviteLevelNew(uid);
+ } else {
+ level = userInviteService.getUserInviteLevel(uid);
+ }
JSONObject inviteLevel = new JSONObject();
- UserInviteLevelEnum level = userInviteService.getUserInviteLevel(uid);
inviteLevel.put("level", level.name());
inviteLevel.put("link", level.getLink());
data.put("inviteLevel", inviteLevel);
+ }
+
+ if (VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ data.put("fansCountLink", configService.get(ConfigKeyEnum.teamStatisticsLink.getKey()));
}
out.print(JsonUtil.loadTrueResult(data));
@@ -2250,7 +2231,7 @@
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
- e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
}
}
@@ -2395,6 +2376,7 @@
}
}
+ //淇敼閭�璇风爜
if (!StringUtil.isNullOrEmpty(inviteCode)) {// 閭�璇风爜涓嶄负绌�
inviteCode = inviteCode.trim();
if (inviteCode.length() >= 4 && inviteCode.length() <= 12) {
--
Gitblit v1.8.0