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/UserInviteSeparateServiceImpl.java | 38 +++++++++++++++-----------------------
1 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteSeparateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteSeparateServiceImpl.java
index 87c9ce3..2dd4cef 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteSeparateServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteSeparateServiceImpl.java
@@ -11,18 +11,16 @@
import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.user.UserInviteSeparateMapper;
-import com.yeshi.fanli.dto.msg.MsgOtherVIPDTO;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInviteSeparate;
import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;
-import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserInviteSeparateService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;
import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
-import com.yeshi.fanli.util.TimeUtil;
@Service
public class UserInviteSeparateServiceImpl implements UserInviteSeparateService {
@@ -47,7 +45,7 @@
@Lazy
@Resource
- private UserOtherMsgNotificationService userOtherMsgNotificationService;
+ private UserInviteMsgNotificationService userInviteMsgNotificationService;
@Override
public void insertSelective(UserInviteSeparate record) {
@@ -73,14 +71,6 @@
inviteSeparate.setCreateTime(new Date());
inviteSeparate.setUpdateTime(new Date());
userInviteSeparateMapper.insertSelective(inviteSeparate);
-
- UserInfo userInfo = userInfoService.getUserById(workerId);
- // 娑堟伅
- MsgOtherVIPDTO msgboss = new MsgOtherVIPDTO();
- msgboss.setContent1(userInfo.getNickName() + " " + workerId);
- msgboss.setContent2("浜�" + TimeUtil.formatDateDot(new Date()) + "鎴愬姛鍗囩骇鎴愪负浼氬憳");
- msgboss.setContent3("浠婃棩璧�" + limitDays + "澶╁唴锛屼綘鏈兘鎴愪负浼氬憳灏嗕細涓庡叾鑴辩閭�璇峰叧绯� ");
- userOtherMsgNotificationService.teamVIPCallBoss(bossId, "濡傛湁鐤戦棶璇疯仈绯绘垜鐨�-浜哄伐瀹㈡湇", msgboss);
}
@Override
@@ -104,7 +94,6 @@
}
-
@Override
@Transactional(rollbackFor = Exception.class)
public void inviteSeparate(UserInviteSeparate record) {
@@ -113,7 +102,6 @@
Long workerId = record.getWorkerId();
Long bossId = record.getBossId();
-
ThreeSale threeSale = threeSaleSerivce.getMyBoss(workerId);
if (threeSale == null) {
// 鎴愬姛鑴辩 涓嶅彂娑堟伅
@@ -136,19 +124,23 @@
} else {
// 鑴辩鍏崇郴
userInviteSeparateMapper.updateStateByWorkerIdAndBossId(workerId, bossId, UserInviteSeparate.STATE_SUCCESS);
-
// 鑴辩閭�璇峰叧绯�
threeSaleSerivce.inviteSeparate(workerId, bossId);
- int limitDays = Integer.parseInt(userVipConfigService.getValueByKey("invite_separate_limit_days"));
- // 娑堟伅 TODO
- UserInfo userInfo = userInfoService.selectByPKey(workerId);
- MsgOtherVIPDTO msgboss = new MsgOtherVIPDTO();
- msgboss.setContent1(userInfo.getNickName() + workerId + "浜�"+ TimeUtil.formatDateDot(record.getCreateTime()) + "鎴愬姛鍗囩骇鎴愪负浼氬憳 ");
- msgboss.setContent2("寰堥仐鎲撅紝浣犳湭鑳藉湪" + limitDays + "澶╁崌绾т负浼氬憳 ");
- msgboss.setContent3("宸蹭笌鍏惰劚绂婚個璇峰叧绯�");
- userOtherMsgNotificationService.teamSplitCallBoss(bossId, "濡傛湁鐤戦棶璇疯仈绯绘垜鐨�-浜哄伐瀹㈡湇", msgboss);
+ UserInfo worker = userInfoService.selectByPKey(workerId);
+
+ // 鎻愰啋涓婄骇鑴辩
+ userInviteMsgNotificationService.fansDivorced(bossId, worker.getNickName(), new Date());
+
+ // 鎻愰啋涓婁笂绾ц劚绂�
+ ThreeSale threeSaleSuper = threeSaleSerivce.getMyBoss(bossId);
+ if (threeSaleSuper != null) { // 绮変笣鍗囩骇鎻愰啋
+ Long bossIdSuper = threeSaleSuper.getBoss().getId();
+ UserInfo boss = userInfoService.selectByPKey(workerId);
+ userInviteMsgNotificationService.fansDivorcedIndirect(bossIdSuper, worker.getNickName(),
+ boss.getNickName(), new Date());
+ }
}
}
--
Gitblit v1.8.0