From 020d940ae4e16f55f69cef3dd4c8dc0b9764af07 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 26 六月 2019 10:59:48 +0800
Subject: [PATCH] 邀请对应奖励红包加入版本区分
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 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 279be36..7685061 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
@@ -26,6 +26,7 @@
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;
@@ -482,7 +483,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, "鐢ㄦ埛淇℃伅涓虹┖");
@@ -526,24 +527,26 @@
// 閭�璇锋秷鎭�
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();
+ if (VersionUtil.greaterThan_1_5_60(platform, version)) {
+ // 濂栧姳娣樼ぜ閲戠孩鍖�
+ 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);
}
- 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, "鐢ㄦ埛淇℃伅涓虹┖");
@@ -593,20 +596,23 @@
// 閭�璇锋秷鎭�
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();
+ if (VersionUtil.greaterThan_1_5_60(platform, version)) {
+ // 濂栧姳娣樼ぜ閲戠孩鍖�
+ 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);
}
- userTaoLiJinOriginService.addInviteWinMoney(inviterId, inviteName);
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e);
}
+
}
/**
--
Gitblit v1.8.0