From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java | 88 +++++++++++++++++++++++---------------------
1 files changed, 46 insertions(+), 42 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 0989106..07bb037 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
@@ -117,9 +117,6 @@
threeSaleMapper.deleteExpireRecord(inviter.getId(), inviteeUser.getId());
}
- // 鍒涘缓閫氱煡
- userInviteMsgNotificationService.inviteScan(inviter.getId(), threeSale);
-
} else {// 鏄凡缁忓瓨鍦ㄧ殑鐢ㄦ埛
if (worker.getId().longValue() == inviter.getId())
throw new ThreeSaleException(4, "涓嶈兘缁戝畾鑷繁");
@@ -163,9 +160,6 @@
threeSaleMapper.deleteExpireRecord(inviter.getId(), worker.getId());
}
- userInviteMsgNotificationService.inviteScan(inviter.getId(), threeSale);
- // threeSaleSerivce.bind(invitee, inviter);
-
} else {
// 杩樺瓨鍦ㄦ湁鏁堢殑閭�璇凤紝鍒欎笉鍋氬鐞�
}
@@ -195,7 +189,6 @@
ts.setSucceedTime(System.currentTimeMillis());
ts.setWorker(worker);
threeSaleMapper.insertSelective(ts);
- inviteSuccess(inviter.getId(), worker.getId(), ts);
} else {
if (!list.get(0).getState() && list.get(0).getExpire() == ThreeSale.EXPIRE_NORMAL
&& list.get(0).getBoss().getId() == inviter.getId().longValue()) {// 鏈敓鏁堢殑涓婄骇鍜岀幇鍦ㄤ笂绾т竴鏍峰氨鐢熸晥
@@ -203,7 +196,6 @@
update.setState(true);
update.setSucceedTime(System.currentTimeMillis());
threeSaleMapper.updateByPrimaryKeySelective(update);
- inviteSuccess(list.get(0).getBoss().getId(), list.get(0).getWorker().getId(), list.get(0));
}
}
}
@@ -238,7 +230,7 @@
// if (inviter != null)
// reComputeUserRank(inviter.getId());
// 娣诲姞鍒伴槦鍒�
- inviteSuccess(oldSale.getBoss().getId(), oldSale.getWorker().getId(), oldSale);
+ inviteSuccess(oldSale.getBoss().getId(), worker);
}
}
@@ -516,7 +508,7 @@
threeSale.setUpdateTime(java.lang.System.currentTimeMillis());
threeSaleMapper.insertSelective(threeSale);
- inviteSuccess(inviter.getId(), invitee.getId(), threeSale);
+ inviteSuccess(inviter.getId(), invitee);
}
@Override
@@ -535,39 +527,48 @@
threeSale.setUpdateTime(java.lang.System.currentTimeMillis());
threeSaleMapper.insertSelective(threeSale);
- UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());
- threeSale.setBoss(boss);
- threeSale.setWorker(invitee);
-
// 閭�璇锋垚鍔燂細娑堟伅銆佺浉鍏冲鐞�
- inviteSuccess(boss.getId(), invitee.getId(), threeSale);
+ inviteSuccess(inviterId, invitee);
}
/**
* 閭�璇锋垚鍔�
*/
@Transactional
- private void inviteSuccess(Long bossId, Long workerId, ThreeSale threeSale) {
- // 閭�璇锋秷鎭�
- UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(bossId);
- if (activeLog != null && VersionUtil.greaterThan_2_0_5(
- "appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android", activeLog.getVersionCode())) { // 2.1鐗堟湰浠ヤ笂
- userInviteMsgNotificationService.inviteSuccess2_1(bossId, threeSale);
- } else { // 鏈�鍒濇秷鎭�
- userInviteMsgNotificationService.inviteSuccess(threeSale.getBoss().getId(), threeSale);
+ private void inviteSuccess(Long bossId, UserInfo invitee) {
+ if (!Constant.IS_TEST) {
+ UserInviteMQMsg msg = new UserInviteMQMsg(bossId, invitee.getId(), null, new Date(), UserInviteMQMsg.STATE_SUCCESS);
+ Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteSuccess, msg);
+ producer.send(message);
}
executor.execute(new Runnable() {
@Override
public void run() {
- // 閭�璇烽噾甯�
- integralGetService.addInviteLevelOne(bossId, workerId);
+ try {
+ // 閭�璇烽噾甯�
+ integralGetService.addInviteLevelOne(bossId, invitee.getId());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ try {
+ // 鐩存帴绮変笣閭�璇锋垚鍔�
+ userInviteMsgNotificationService.directInviteSuccess(bossId, invitee.getNickName(),
+ invitee.getPortrait(), new Date());
+
+ // 闂存帴绮変笣閭�璇锋垚鍔�
+ ThreeSale myBoss = threeSaleMapper.getMyBoss(bossId);
+ if (myBoss != null) {
+ UserInfo boss = userInfoService.selectByPKey(bossId);
+ userInviteMsgNotificationService.indirectInviteSuccess(bossId, boss.getNickName(),
+ invitee.getNickName(), invitee.getPortrait(), new Date());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
});
- UserInviteMQMsg msg = new UserInviteMQMsg(bossId, workerId, null, new Date(), UserInviteMQMsg.STATE_SUCCESS);
- Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteSuccess, msg);
- if (!Constant.IS_TEST)
- producer.send(message);
}
/**
@@ -610,23 +611,22 @@
public List<ThreeSale> listFirstTeamByUndeleted(long start, int count, Long uid) {
return threeSaleMapper.listFirstTeamByUndeleted(start, count, uid);
}
-
+
@Override
public long countFirstTeamByUndeleted(Long uid) {
return threeSaleMapper.countFirstTeamByUndeleted(uid);
}
-
+
@Override
public List<ThreeSale> listSecondTeamByUndeleted(long start, int count, Long uid) {
return threeSaleMapper.listSecondTeamByUndeleted(start, count, uid);
}
-
+
@Override
public long countSecondTeamByUndeleted(Long uid) {
return threeSaleMapper.countSecondTeamByUndeleted(uid);
}
-
-
+
@Override
public List<ThreeSale> listSecondTeam(long start, int count, Long uid, Integer state) {
return threeSaleMapper.listSecondTeam(start, count, uid, state);
@@ -670,8 +670,12 @@
return deepList;
}
-
-
+
+ @Override
+ public List<ThreeSale> getMyBossDeepList(Long uid) {
+ //TODO 闇�瑕佹洿鍔犵畝渚跨殑鏂瑰紡澶勭悊
+ return getMyBossDeepList(uid, 100);
+ }
@Override
public void remvoeBreak(Long id, Long uid, Long tid) {
@@ -679,33 +683,33 @@
if (threeSale == null) {
return;
}
-
+
Long workerId = threeSale.getWorker().getId();
if (tid.longValue() != workerId.longValue()) {
return;
}
-
+
Integer expire = threeSale.getExpire();
if (expire == ThreeSale.EXPIRE_NORMAL) {
return;
}
-
+
int upExpire = expire;
Long bossId = threeSale.getBoss().getId();
if (bossId.longValue() == uid.longValue()) { // 鐩存帴绮変笣
if (expire == ThreeSale.EXPIRE_BREAK_VIP_DEL4) {
- upExpire =ThreeSale.EXPIRE_BREAK_VIP_DEL34;
+ upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL34;
} else {
upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL3;
}
} else { // 闂存帴绮変笣
if (expire == ThreeSale.EXPIRE_BREAK_VIP_DEL3) {
- upExpire =ThreeSale.EXPIRE_BREAK_VIP_DEL34;
+ upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL34;
} else {
upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL4;
}
}
-
+
ThreeSale update = new ThreeSale();
update.setId(id);
update.setExpire(upExpire);
--
Gitblit v1.8.0