From 7e37f77192fa701e309fa04f821aa5fd5259ca33 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 01 四月 2020 09:28:31 +0800
Subject: [PATCH] 队员列表
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 22 +++++++++++++++++-----
1 files changed, 17 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 a3ebca6..e44029a 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
@@ -471,7 +471,7 @@
validFans = true;
}
- // 鏈�杩戠櫥褰曟椂闂�
+ // 鏈�杩戠矇涓濈櫥褰曟椂闂�
Date lastLoginTime = new Date(threeSale.getCreateTime());
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(workerId);
if (userInfoExtra != null && userInfoExtra.getActiveTime() != null) {
@@ -488,9 +488,9 @@
JSONArray array = new JSONArray();
array.add(loginJson);
- // 绛夌骇
+ // 鏌ヨ绮変笣绛夌骇
UserInviteLevelEnum level = null;
- UserVIPLevel vipLevel = userInviteService.getVIPLevelByUid(uid);
+ UserVIPLevel vipLevel = userInviteService.getVIPLevelByUid(workerId);
if (vipLevel != null) {
if (vipLevel.getLevel() == UserVIPLevel.LEVEL_3) {
level = UserInviteLevelEnum.actived;
@@ -523,8 +523,9 @@
// 鍒ゆ柇鏄惁瀛樺湪鑴辩鍏崇郴闃熷憳
- if (vipLevel != null) {
- UserInviteSeparate separate = userInviteSeparateService.selectByWorkerIdAndBossId(workerId, uid);
+ if (vipLevel != null && state) {
+ Long bossId = threeSale.getBoss().getId();
+ UserInviteSeparate separate = userInviteSeparateService.selectByWorkerIdAndBossId(workerId, bossId);
if (separate != null && separate.getEndTime() != null) {
try {
JSONObject contentJson1 = new JSONObject();
@@ -907,6 +908,17 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
+
+ @RequestMapping(value = "remvoeBreak")
+ public void remvoeBreak(String callback, AcceptData acceptData,Long inviteId, Long uid, Long tid, PrintWriter out) {
+ if (uid == null || inviteId == null || tid == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犺緭鍙傛暟涓嶅畬鏁�"));
+ return;
+ }
+ threeSaleSerivce.remvoeBreak(inviteId, uid, tid);
+
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ }
}
--
Gitblit v1.8.0