From d5c2554ebae75afbff31c3c2966cc3a747ba941c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 27 四月 2020 15:00:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
index 119559b..0a30989 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
@@ -208,7 +208,6 @@
}
}
-
@Override
public List<ThreeSale> listFirstTeamQuery(long start, int count, Long uid, Integer state, String startTime,
String endTime, Integer validState) {
@@ -401,13 +400,12 @@
return threeSaleMapper.getSuccessRelationshipNum(uid);
}
-
@Override
@Transactional(rollbackFor = Exception.class)
public void bindInviteRelationship(Long workerId, Long bossId) throws ThreeSaleException {
if (workerId == null || bossId == null)
throw new ThreeSaleException(1, "鐢ㄦ埛淇℃伅涓虹┖");
-
+
// 鏂板缓绔嬬‘瀹氬叧绯�
ThreeSale threeSale = new ThreeSale();
threeSale.setBoss(new UserInfo(bossId));
@@ -429,7 +427,8 @@
@Transactional
private void inviteSuccess(Long workerId, Long bossId) {
if (!Constant.IS_TEST) {
- UserInviteMQMsg msg = new UserInviteMQMsg(bossId, workerId, null, new Date(), UserInviteMQMsg.STATE_SUCCESS);
+ UserInviteMQMsg msg = new UserInviteMQMsg(bossId, workerId, null, new Date(),
+ UserInviteMQMsg.STATE_SUCCESS);
Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteSuccess, msg);
producer.send(message);
}
@@ -442,19 +441,19 @@
} catch (Exception e) {
e.printStackTrace();
}
-
+
try {
// 鐩存帴绮変笣閭�璇锋垚鍔�
UserInfo invitee = userInfoService.selectByPKey(workerId);
userInviteMsgNotificationService.directInviteSuccess(bossId, invitee.getNickName(),
invitee.getPortrait(), new Date());
-
+
// 闂存帴绮変笣閭�璇锋垚鍔�
ThreeSale myBoss = threeSaleMapper.getMyBoss(bossId);
if (myBoss != null) {
UserInfo boss = userInfoService.selectByPKey(bossId);
- userInviteMsgNotificationService.indirectInviteSuccess(myBoss.getBoss().getId(),
- boss.getNickName(), invitee.getNickName(), invitee.getPortrait(), new Date());
+ userInviteMsgNotificationService.indirectInviteSuccess(myBoss.getBoss().getId(),
+ boss.getNickName(), invitee.getNickName(), invitee.getPortrait(), new Date());
}
} catch (Exception e) {
e.printStackTrace();
@@ -474,7 +473,6 @@
return threeSaleMapper.getByWorkerId(workerId);
}
-
@Override
public ThreeSale selectByWorkerId(Long workerId) {
return threeSaleMapper.selectSuccessByWorkerId(workerId);
@@ -499,7 +497,7 @@
public List<ThreeSale> listSecondTeam(long start, int count, Long uid) {
return threeSaleMapper.listSecondTeam(start, count, uid);
}
-
+
@Override
public long countFirstTeam(Long uid) {
return threeSaleMapper.countFirstTeam(uid);
@@ -509,7 +507,6 @@
public long countSecondTeam(Long uid) {
return threeSaleMapper.countSecondTeam(uid);
}
-
@Override
public ThreeSale selectLatestByWorkerIdAndState(Long workerId, int state) {
@@ -552,8 +549,19 @@
@Override
public List<ThreeSale> getMyBossDeepList(Long uid) {
- //TODO 闇�瑕佹洿鍔犵畝渚跨殑鏂瑰紡澶勭悊
+ // TODO 闇�瑕佹洿鍔犵畝渚跨殑鏂瑰紡澶勭悊
return getMyBossDeepList(uid, 100);
}
+ @Override
+ public Long getTopBoss(Long uid) {
+ Long bossUid = null;
+ UserInfo boss = getBoss(uid);
+ while (boss != null) {
+ bossUid = boss.getId();
+ boss = getBoss(boss.getId());
+ }
+ return bossUid;
+ }
+
}
--
Gitblit v1.8.0