From 822e2bc06f9e95f357867d457c004e7bb1f67db8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 16:27:15 +0800
Subject: [PATCH] 签到通知
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 303414d..0316022 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
@@ -23,6 +23,7 @@
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleExtraInfoSerivce;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;
import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
@@ -69,6 +70,10 @@
@Resource
private ThreeSaleExtraInfoSerivce threeSaleExtraInfoSerivce;
+
+ @Resource
+ private IntegralGetService integralGetService;
+
@Resource(name = "taskExecutor")
@@ -406,13 +411,11 @@
object.put("memoName", memoName);
String nickName = "";
- Long workerId= null;
String portrait = "";
Long lastLoginTime = null;
UserInfo worker = threeSale.getWorker();
if (worker != null) {
- workerId = worker.getId();
portrait = worker.getPortrait();
lastLoginTime = worker.getLastLoginTime();
nickName = worker.getNickName();
@@ -505,7 +508,7 @@
@Override
@Transactional
- public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter, String platform, String version) throws ThreeSaleException {
+ public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter) throws ThreeSaleException {
if (invitee == null || inviter == null)
throw new ThreeSaleException(1, "鐢ㄦ埛淇℃伅涓虹┖");
@@ -515,6 +518,8 @@
if (threeSale != null) {
// 鏈夋晥鍏崇郴--鐢熸晥
+ threeSale.setBoss(inviter);
+ threeSale.setWorker(invitee);
threeSale.setState(true);
threeSale.setExpire(ThreeSale.EXPIRE_NORMAL);
threeSale.setSucceedTime(java.lang.System.currentTimeMillis());
@@ -552,8 +557,9 @@
executor.execute(new Runnable() {
@Override
public void run() {
+
+ UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(inviter.getId());
try {
- UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(inviter.getId());
if (activeLog != null && !StringUtil.isNullOrEmpty(activeLog.getVersionCode()) ) {
String versionCode = activeLog.getVersionCode();
String channel = activeLog.getChannel();
@@ -582,6 +588,9 @@
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
+
+ // 閭�璇烽噾甯�
+ integralGetService.addInviteLevelOne(inviter.getId(), invitee.getId());
}
});
@@ -590,7 +599,7 @@
@Override
@Transactional
- public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld, String platform, String version) throws ThreeSaleException {
+ public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld) throws ThreeSaleException {
if (invitee == null || (inviterId == null && threeSaleOld == null))
throw new ThreeSaleException(1, "鐢ㄦ埛淇℃伅涓虹┖");
@@ -633,6 +642,7 @@
UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());
threeSale.setBoss(boss);
+ threeSale.setWorker(invitee);
// 娣诲姞鍒伴槦鍒�
ThreeSaleCMQManager.getInstance().addThreeSaleMsg(threeSale);
--
Gitblit v1.8.0