From 106a09463e66ffe39383bdab28f501ec47b5fcc4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 18 五月 2020 14:07:16 +0800
Subject: [PATCH] 最新订单号
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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..f038027 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
@@ -905,6 +905,7 @@
|| focus.getMinFansNum() != null || focus.getMinFansNum() != null
|| focus.getMinActiveTime() != null || focus.getMaxActiveTime() != null
|| focus.getMinIncome() != null || focus.getMaxIncome() != null
+ || focus.getMinJoinTime() != null || focus.getMaxJoinTime() != null
|| !StringUtil.isNullOrEmpty(focus.getKey()) || !StringUtil.isNullOrEmpty(focus.getLevel()))
return true;
@@ -1104,9 +1105,16 @@
return;
}
- // 涓婄骇
- UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());
-
+ // 闈炵洿鎺ラ個璇峰叧绯�
+ String bossNickName = null;
+ if (uid.longValue() != threeSale.getBoss().getId().longValue()) {
+ UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());
+ if (boss != null) {
+ bossNickName = boss.getNickName();
+ }
+ }
+
+
JSONArray tagArray = new JSONArray();
String memoName = user.getNickName();
@@ -1124,7 +1132,7 @@
}
}
- data.put("bossNickName", boss.getNickName());
+ data.put("bossNickName", bossNickName);
data.put("nickName", user.getNickName());
data.put("phone", phone);
data.put("phoneCopy", phoneCopy);
@@ -1200,11 +1208,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 +1236,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