From a56bd9db6b5c989fb2eaecd3a854ac6782b55f95 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 26 十月 2019 14:44:19 +0800
Subject: [PATCH] 淘宝维权退款服务修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java | 77 +++-----------------------------------
1 files changed, 6 insertions(+), 71 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 c31f84f..57821d3 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
@@ -17,12 +17,9 @@
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.user.ThreeSaleException;
-import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
-import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
@@ -33,7 +30,6 @@
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.cmq.ThreeSaleCMQManager;
import net.sf.json.JSONArray;
@@ -61,9 +57,6 @@
private MsgInviteDetailService msgInviteDetailService;
@Resource
- private UserTaoLiJinOriginService userTaoLiJinOriginService;
-
- @Resource
private UserActiveLogService userActiveLogService;
@Resource
@@ -72,7 +65,6 @@
@Resource
private ThreeSaleExtraInfoSerivce threeSaleExtraInfoSerivce;
-
@Lazy
@Resource
private IntegralGetService integralGetService;
@@ -553,38 +545,6 @@
executor.execute(new Runnable() {
@Override
public void run() {
-
- UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(inviter.getId());
- try {
- 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);
- }
-
// 閭�璇烽噾甯�
integralGetService.addInviteLevelOne(inviter.getId(), invitee.getId());
}
@@ -649,37 +609,6 @@
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);
- }
-
// 閭�璇烽噾甯�
integralGetService.addInviteLevelOne(boss.getId(), invitee.getId());
}
@@ -722,4 +651,10 @@
return threeSaleMapper.listSecondTeam(start, count, uid, state);
}
+ @Override
+ public ThreeSale selectLatestByWorkerIdAndState(Long workerId, int state) {
+
+ return threeSaleMapper.selectLatestByWorkerIdAndState(workerId, state);
+ }
+
}
--
Gitblit v1.8.0