From a0a5b70e0d0df9357d09542f20dc6633a986f328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 六月 2019 11:06:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
index 93cef48..279be36 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
@@ -17,10 +17,12 @@
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.exception.ThreeSaleException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;
import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;
+import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -49,6 +51,10 @@
@Resource
private MsgInviteDetailService msgInviteDetailService;
+
+ @Resource
+ private UserTaoLiJinOriginService userTaoLiJinOriginService;
+
public UserInfo getBoss(final long uid) {
return threeSaleMapper.selectBoss(uid);
@@ -519,6 +525,20 @@
// 閭�璇锋秷鎭�
userInviteMsgNotificationService.inviteSuccess(inviter.getId(), threeSale);
+
+ // 濂栧姳娣樼ぜ閲戠孩鍖�
+ try {
+ String inviteName= invitee.getNickName();
+ if (StringUtil.isNullOrEmpty(inviteName)) {
+ UserInfo userInfo = userInfoService.selectByPKey(invitee.getId());
+ if (userInfo != null) {
+ inviteName= userInfo.getNickName();
+ }
+ }
+ userTaoLiJinOriginService.addInviteWinMoney(inviter.getId(), inviteName);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
}
@Override
@@ -572,6 +592,21 @@
ThreeSaleCMQManager.getInstance().addThreeSaleMsg(threeSale);
// 閭�璇锋秷鎭�
userInviteMsgNotificationService.inviteSuccess(threeSale.getBoss().getId(), threeSale);
+
+ // 濂栧姳娣樼ぜ閲戠孩鍖�
+ try {
+ String inviteName= invitee.getNickName();
+ if (StringUtil.isNullOrEmpty(inviteName)) {
+ UserInfo userInfo = userInfoService.selectByPKey(invitee.getId());
+ if (userInfo != null) {
+ inviteName= userInfo.getNickName();
+ }
+ }
+ userTaoLiJinOriginService.addInviteWinMoney(inviterId, inviteName);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+
}
/**
--
Gitblit v1.8.0