From e33f868ce527b080b470ec89bee0f33e25dea960 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 14 五月 2020 18:04:59 +0800
Subject: [PATCH] 粉丝信息统计
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 c98803b..a837701 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
@@ -1106,7 +1106,6 @@
// 涓婄骇
UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());
-
JSONArray tagArray = new JSONArray();
String memoName = user.getNickName();
@@ -1200,11 +1199,12 @@
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);
long countPDD = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_PDD, 60);
-
+
data.put("fansNum", "鐩存帴绮変笣锛� "+directNum+"浜篭n" + "闂存帴绮変笣锛� "+indirectNum+"浜�");
data.put("orderInfo", "娣樺疂 ("+countTB+"绗�)\n" + "浜笢 ("+countJD+"绗�)\n" + "鎷煎澶� ("+countPDD+"绗�)");
out.print(JsonUtil.loadTrueResult(data));
@@ -1227,7 +1227,7 @@
int type = 1;
ThreeSale threeSale = threeSaleSerivce.getByWorkerId(workerId);
- if (threeSale == null) {
+ if (threeSale != null && threeSale.getBoss().getId() != uid) {
type = 2;
}
--
Gitblit v1.8.0