From ac18247de1bf14b44fd438b35d783c1a313f5286 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 14 五月 2020 16:57:44 +0800
Subject: [PATCH] 数据预览
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 ff5e5ab..a959b32 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());
@@ -904,7 +904,8 @@
if (focus.getStateValid() != null || focus.getTaobaoBind() != null || focus.getWeixinBind() != null
|| focus.getMinFansNum() != null || focus.getMinFansNum() != null
|| focus.getMinActiveTime() != null || focus.getMaxActiveTime() != null
- || focus.getMinIncome() != null || focus.getMaxIncome() != null || !StringUtil.isNullOrEmpty(focus.getKey()))
+ || focus.getMinIncome() != null || focus.getMaxIncome() != null
+ || !StringUtil.isNullOrEmpty(focus.getKey()) || !StringUtil.isNullOrEmpty(focus.getLevel()))
return true;
return false;
@@ -1226,7 +1227,7 @@
int type = 1;
ThreeSale threeSale = threeSaleSerivce.getByWorkerId(workerId);
- if (threeSale == null) {
+ if (threeSale != null && threeSale.getBoss().getId() != uid) {
type = 2;
}
@@ -1247,6 +1248,7 @@
threeSaleExtraInfoSerivce.insertSelective(saleExtraInfo);
}
+ // 鏇存柊绮変笣璁板綍淇℃伅
teamFansInfoService.updateTags(workerId, type, tags);
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
}
--
Gitblit v1.8.0