From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java | 96 +++++++++++++++++++++++-------------------------
1 files changed, 46 insertions(+), 50 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java
index cdb7685..aeb7b47 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java
@@ -19,6 +19,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
@@ -37,68 +38,72 @@
@Resource
private TeamFansInfoDao teamFansInfoDao;
-
+
@Resource
private ThreeSaleSerivce threeSaleSerivce;
-
+
@Resource
- private UserInfoService userInfoService;
-
+ private UserInfoService userInfoService;
+
@Resource
private UserInfoExtraService userInfoExtraService;
-
+
@Resource
private ThreeSaleExtraInfoSerivce threeSaleExtraInfoSerivce;
-
+
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
-
+
@Resource
private HongBaoV2CountService hongBaoV2CountService;
-
+
@Resource
private UserInviteService userInviteService;
-
+
@Resource
private CommonOrderService commonOrderService;
-
+
@Resource
private UserActiveLogService userActiveLogService;
-
-
-
@Override
public void save(TeamFansInfo record) {
- if (record == null || record.getWorkerId() == null ) {
+ if (record == null || record.getWorkerId() == null) {
return;
}
- record.setId(record.getWorkerId().toString());
+ // 鏃犻個璇峰叧绯� 涓嶆搷浣�
+ ThreeSale threeSale = threeSaleSerivce.selectByWorkerId(record.getWorkerId());
+ if (threeSale == null)
+ return;
+
+ record.setId(record.getWorkerId().toString());
+
TeamFansInfo teamFansInfo = teamFansInfoDao.get(record.getId());
if (teamFansInfo != null) {
teamFansInfoDao.updateSelective(record);
+ LogHelper.test("闃熷憳绮変笣淇℃伅:鏇存柊-" + record.getId());
} else {
initData(record);
- record.setUpdateTime(new Date());
+ record.setCrateTime(new Date());
+ LogHelper.test("闃熷憳绮変笣淇℃伅:鏂板-" + record.getId());
teamFansInfoDao.save(record);
}
}
-
-
+
/**
* 鍒濆鍖栨暟鎹�
* @param record
*/
private void initData(TeamFansInfo record) {
if (StringUtil.isNullOrEmpty(record.getNickName()))
- record.setNickName("");
+ record.setNickName("");
if (record.getLevel() == null)
- record.setLevel(UserLevelEnum.daRen);
+ record.setLevel(UserLevelEnum.daRen);
if (record.getStateValid() == null)
record.setStateValid(false);
if (record.getTaobaoBind() == null)
- record.setTaobaoBind(false);
+ record.setTaobaoBind(false);
if (record.getWeixinId() == null)
record.setWeixinId("");
if (record.getPhone() == null)
@@ -123,15 +128,15 @@
record.setMemoNameSup("");
if (record.getTagsSup() == null)
record.setTagsSup("");
-
+
if (StringUtil.isNullOrEmpty(record.getWeixinId())) {
record.setWeixinIdExist(false);
} else {
record.setWeixinIdExist(true);
}
-
+
}
-
+
@Override
public void addFansInfo(Long workerId, Long bossId, Date successTime) {
UserInfo userInfo = userInfoService.selectByPKey(workerId);
@@ -146,8 +151,7 @@
// 澶囨敞鍚�
String memoName = null;
- ThreeSaleExtraInfo threeSaleExtraInfo = threeSaleExtraInfoSerivce.getbyBossIdAndWorkerId(bossId,
- workerId);
+ ThreeSaleExtraInfo threeSaleExtraInfo = threeSaleExtraInfoSerivce.getbyBossIdAndWorkerId(bossId, workerId);
if (threeSaleExtraInfo != null) {
if (!StringUtil.isNullOrEmpty(threeSaleExtraInfo.getNickname())) {
memoName = threeSaleExtraInfo.getNickname();
@@ -246,8 +250,7 @@
focusInfo.setId(workerId.toString());
save(focusInfo);
}
-
-
+
@Override
public void updateMemoName(Long workerId, int type, String memoName) {
TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -259,8 +262,7 @@
}
save(teamFansInfo);
}
-
-
+
@Override
public void updateTags(Long workerId, int type, String tags) {
TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -272,8 +274,7 @@
}
save(teamFansInfo);
}
-
-
+
@Override
public void updateNickName(Long workerId, String nickName) {
TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -281,8 +282,7 @@
teamFansInfo.setNickName(nickName);
save(teamFansInfo);
}
-
-
+
@Override
public void updateStateValid(Long workerId, boolean stateValid) {
TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -290,7 +290,7 @@
teamFansInfo.setStateValid(stateValid);
save(teamFansInfo);
}
-
+
@Override
public void updateTaobaoBind(Long workerId, boolean taobaoBind) {
TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -298,7 +298,7 @@
teamFansInfo.setTaobaoBind(taobaoBind);
save(teamFansInfo);
}
-
+
@Override
public void updateActiveTime(Long workerId, Date activeTime) {
TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -307,7 +307,6 @@
save(teamFansInfo);
}
-
@Override
public void updateWeixinId(Long workerId, String weixinId) {
TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -320,8 +319,7 @@
}
save(teamFansInfo);
}
-
-
+
@Override
public void updateInviteCode(Long workerId, String inviteCode) {
TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -329,7 +327,7 @@
teamFansInfo.setInviteCode(inviteCode);
save(teamFansInfo);
}
-
+
@Override
public void updatePhone(Long workerId, String phone) {
TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -337,7 +335,7 @@
teamFansInfo.setPhone(phone);
save(teamFansInfo);
}
-
+
@Override
public void updateLevel(Long workerId, UserLevelEnum level) {
TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -345,7 +343,7 @@
teamFansInfo.setWorkerId(workerId);
save(teamFansInfo);
}
-
+
@Override
public void updatePhoneOpen(Long workerId, boolean phoneOpen) {
TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -353,21 +351,20 @@
teamFansInfo.setPhoneOpen(phoneOpen);
save(teamFansInfo);
}
-
-
+
@Override
public void updateIncome(Long workerId, BigDecimal income) {
if (income == null) {
income = BigDecimal.ZERO;
}
-
+
TeamFansInfo teamFansInfo = new TeamFansInfo();
teamFansInfo.setWorkerId(workerId);
teamFansInfo.setIncome(income.multiply(BigDecimal.valueOf(100)).setScale(0, BigDecimal.ROUND_DOWN).intValue());
teamFansInfo.setIncomeTime(new Date());
save(teamFansInfo);
}
-
+
@Override
public void updateFansNum(Long workerId) {
long firstTeam = threeSaleSerivce.countFirstTeam(workerId);
@@ -378,18 +375,17 @@
teamFansInfo.setFansNum(fansNum);
save(teamFansInfo);
}
-
-
+
@Override
public List<TeamFansInfo> query(int start, int count, int type, Long uid, ThreeSaleFocusDTO focusDTO) {
return teamFansInfoDao.query(start, count, type, uid, focusDTO);
}
-
+
@Override
public long count(int type, Long uid, ThreeSaleFocusDTO focusDTO) {
return teamFansInfoDao.count(type, uid, focusDTO);
}
-
+
@Override
public TeamFansInfo getbyWorkerId(Long workerId) {
return teamFansInfoDao.getbyWorkerId(workerId);
--
Gitblit v1.8.0