From f00114371d8d379da18bc7fed3541b2575edea56 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 23 八月 2019 15:17:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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 a5ddef1..958ed1d 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")
@@ -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,23 @@
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
+
+ if (activeLog != null && !StringUtil.isNullOrEmpty(activeLog.getVersionCode()) ) {
+ String versionCode = activeLog.getVersionCode();
+ String channel = activeLog.getChannel();
+
+ boolean result = false;
+ if (!StringUtil.isNullOrEmpty(channel) && "appstore".equalsIgnoreCase(channel)) {
+ result = VersionUtil.greaterThan_1_6_5("ios", versionCode);
+ } else {
+ result = VersionUtil.greaterThan_1_6_5("android", versionCode);
+ }
+
+ if (result) {
+ // 閭�璇烽噾甯�
+ integralGetService.addInviteLevelOne(inviter.getId(), invitee.getId());
+ }
+ }
}
});
--
Gitblit v1.8.0