From 8870f82f07541e27dc6b94b310070625ff9cc6ff Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 十一月 2019 15:18:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 94753bb..76f9c5a 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
@@ -22,6 +22,7 @@
import com.yeshi.fanli.dto.mq.user.body.UserInviteMQMsg;
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.user.ThreeSaleException;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
@@ -35,6 +36,7 @@
import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
import net.sf.json.JSONArray;
@@ -600,7 +602,18 @@
@Transactional
private void inviteSuccess(Long bossId, Long workerId, ThreeSale threeSale) {
// 閭�璇锋秷鎭�
- userInviteMsgNotificationService.inviteSuccess(threeSale.getBoss().getId(), threeSale);
+ UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(bossId);
+ if (activeLog != null) {
+ if (VersionUtil.greaterThan_2_0_2("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
+ activeLog.getVersionCode())) { // 2.0.2鐗堟湰浠ヤ笂
+ userInviteMsgNotificationService.inviteSuccess2_0_2(bossId, threeSale);
+ } else { // 鏈�鍒濇秷鎭�
+ userInviteMsgNotificationService.inviteSuccess(threeSale.getBoss().getId(), threeSale);
+ }
+ } else { // 鏈�鍒濇秷鎭�
+ userInviteMsgNotificationService.inviteSuccess(threeSale.getBoss().getId(), threeSale);
+ }
+
executor.execute(new Runnable() {
@Override
public void run() {
@@ -652,8 +665,11 @@
@Override
public ThreeSale selectLatestByWorkerIdAndState(Long workerId, int state) {
-
return threeSaleMapper.selectLatestByWorkerIdAndState(workerId, state);
}
+ @Override
+ public ThreeSale getByWorkerIdAndTime(Long workerId, long time) {
+ return threeSaleMapper.getByWorkerIdAndTime(workerId, time);
+ }
}
--
Gitblit v1.8.0