From 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 09 五月 2020 21:41:27 +0800
Subject: [PATCH] 2.1需求
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 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..21596a0 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
@@ -892,6 +892,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 +922,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 +981,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();
@@ -1041,9 +1045,9 @@
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();
}
@@ -1117,8 +1121,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 +1165,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));
}
@@ -1225,8 +1232,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");
@@ -1294,9 +1301,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