From aa9776a39b03e4eab22a42bd40156eabb7ddf75a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 16 五月 2020 15:07:16 +0800
Subject: [PATCH] 添加创建时间
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 0fa4be7..3cdbc93 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
@@ -477,7 +477,7 @@
object.put("level", level.name());
object.put("validFans", validFans);
- if (wxtip && type == 1 && threeSale.getState() != null && threeSale.getState()) {
+ if (wxtip) {
// 涓�绾ч槦鍛� 鏌ヨ鏄电О澶囨敞
String memoName = null;
ThreeSaleExtraInfo threeSaleExtraInfo = threeSale.getThreeSaleExtraInfo();
@@ -488,7 +488,7 @@
}
object.put("memoName", memoName);
- if (!VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (type == 1 && !VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {
// 娣诲姞寰俊淇℃伅
if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin())) {
object.put("weiXin", userInfoExtra.getWeiXin());
@@ -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;
@@ -1106,7 +1107,6 @@
// 涓婄骇
UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());
-
JSONArray tagArray = new JSONArray();
String memoName = user.getNickName();
@@ -1200,11 +1200,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 +1228,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