From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 98 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 95 insertions(+), 3 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..692f57f 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
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
+import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -15,15 +16,20 @@
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
+import com.yeshi.fanli.entity.bus.user.UserActiveLog;
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.UserActiveLogService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.cmq.ThreeSaleCMQManager;
import net.sf.json.JSONArray;
@@ -49,6 +55,17 @@
@Resource
private MsgInviteDetailService msgInviteDetailService;
+
+ @Resource
+ private UserTaoLiJinOriginService userTaoLiJinOriginService;
+
+ @Resource
+ private UserActiveLogService userActiveLogService;
+
+ @Resource(name = "taskExecutor")
+ private TaskExecutor executor;
+
+
public UserInfo getBoss(final long uid) {
return threeSaleMapper.selectBoss(uid);
@@ -476,7 +493,7 @@
@Override
@Transactional
- public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter) throws ThreeSaleException {
+ public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter, String platform, String version) throws ThreeSaleException {
if (invitee == null || inviter == null)
throw new ThreeSaleException(1, "鐢ㄦ埛淇℃伅涓虹┖");
@@ -519,11 +536,49 @@
// 閭�璇锋秷鎭�
userInviteMsgNotificationService.inviteSuccess(inviter.getId(), threeSale);
+
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(inviter.getId());
+ if (activeLog != null && !StringUtil.isNullOrEmpty(activeLog.getVersionCode()) ) {
+ String versionCode = activeLog.getVersionCode();
+ String channel = activeLog.getChannel();
+
+ boolean result = false;
+ // 娓犻亾鏄痑ppstore 鍒ゆ柇涓篒OS
+ if (!StringUtil.isNullOrEmpty(channel) && "appstore".equalsIgnoreCase(channel)) {
+ result = VersionUtil.greaterThan_1_5_60("ios", versionCode);
+ } else {
+ result = VersionUtil.greaterThan_1_5_60("android", versionCode);
+ }
+
+ if (result) {
+ // 琚個璇峰悕绉�
+ 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
@Transactional
- public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld) throws ThreeSaleException {
+ public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld, String platform, String version) throws ThreeSaleException {
if (invitee == null || (inviterId == null && threeSaleOld == null))
throw new ThreeSaleException(1, "鐢ㄦ埛淇℃伅涓虹┖");
@@ -567,11 +622,48 @@
UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());
threeSale.setBoss(boss);
-
// 娣诲姞鍒伴槦鍒�
ThreeSaleCMQManager.getInstance().addThreeSaleMsg(threeSale);
+
// 閭�璇锋秷鎭�
userInviteMsgNotificationService.inviteSuccess(threeSale.getBoss().getId(), threeSale);
+
+
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(inviterId);
+ if (activeLog != null && !StringUtil.isNullOrEmpty(activeLog.getVersionCode()) ) {
+ boolean result = false;
+ String versionCode = activeLog.getVersionCode();
+ String channel = activeLog.getChannel();
+
+ // 娓犻亾鏄痑ppstore 鍒ゆ柇涓篒OS
+ if (!StringUtil.isNullOrEmpty(channel) && "appstore".equalsIgnoreCase(channel)) {
+ result = VersionUtil.greaterThan_1_5_60("ios", versionCode);
+ } else {
+ result = VersionUtil.greaterThan_1_5_60("android", versionCode);
+ }
+
+ if (result) {
+ // 琚個璇峰悕绉�
+ 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