From e33752e9f600e6e0cdb9c0119b5ea286be33162c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 十一月 2019 12:13:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
index 85fa7e8..d94b79a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
@@ -603,13 +603,9 @@
private void inviteSuccess(Long bossId, Long workerId, ThreeSale threeSale) {
// 閭�璇锋秷鎭�
UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(bossId);
- if (activeLog != null) {
- if (VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
- activeLog.getVersionCode())) { // 2.0.2鐗堟湰浠ヤ笂
- userInviteMsgNotificationService.inviteSuccess2_0_2(bossId, threeSale);
- } else { // 鏈�鍒濇秷鎭�
- userInviteMsgNotificationService.inviteSuccess(threeSale.getBoss().getId(), threeSale);
- }
+ if (activeLog != null && VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
+ activeLog.getVersionCode())) { // 2.1鐗堟湰浠ヤ笂
+ userInviteMsgNotificationService.inviteSuccess2_1(bossId, threeSale);
} else { // 鏈�鍒濇秷鎭�
userInviteMsgNotificationService.inviteSuccess(threeSale.getBoss().getId(), threeSale);
}
--
Gitblit v1.8.0