From beef9055e75ec66abd95d642861e4aab74932a95 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 五月 2020 10:38:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java | 71 ++++++++++++++++-------------------
1 files changed, 33 insertions(+), 38 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 cf12e39..3e4caa4 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
@@ -66,30 +66,6 @@
@Resource
private UserActiveLogService userActiveLogService;
- @Override
- public void save(TeamFansInfo record) {
- if (record == null || record.getWorkerId() == null) {
- return;
- }
-
- // 鏃犻個璇峰叧绯� 涓嶆搷浣�
- 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("save-鏇存柊-" + record.getId());
- } else {
- initData(record);
- record.setCrateTime(new Date());
- LogHelper.test("save-鏂板-" + record.getId());
- teamFansInfoDao.save(record);
- }
- }
/**
* 鍒濆鍖栨暟鎹�
@@ -251,7 +227,12 @@
focusInfo.setStateValid(stateValid);
focusInfo.setLevel(level);
focusInfo.setId(workerId.toString());
- save(focusInfo);
+ focusInfo.setCrateTime(new Date());
+
+ // 鍒濆鍖栧��
+ initData(focusInfo);
+
+ teamFansInfoDao.save(focusInfo);
}
@Override
@@ -264,7 +245,7 @@
} else {
teamFansInfo.setMemoNameSup(memoName);
}
- save(teamFansInfo);
+ update(teamFansInfo);
}
@Override
@@ -277,7 +258,7 @@
} else {
teamFansInfo.setTagsSup(tags);
}
- save(teamFansInfo);
+ update(teamFansInfo);
}
@Override
@@ -286,7 +267,7 @@
TeamFansInfo teamFansInfo = new TeamFansInfo();
teamFansInfo.setWorkerId(workerId);
teamFansInfo.setNickName(nickName);
- save(teamFansInfo);
+ update(teamFansInfo);
}
@Override
@@ -295,7 +276,7 @@
TeamFansInfo teamFansInfo = new TeamFansInfo();
teamFansInfo.setWorkerId(workerId);
teamFansInfo.setStateValid(stateValid);
- save(teamFansInfo);
+ update(teamFansInfo);
}
@Override
@@ -304,7 +285,7 @@
TeamFansInfo teamFansInfo = new TeamFansInfo();
teamFansInfo.setWorkerId(workerId);
teamFansInfo.setTaobaoBind(taobaoBind);
- save(teamFansInfo);
+ update(teamFansInfo);
}
@Override
@@ -313,7 +294,7 @@
TeamFansInfo teamFansInfo = new TeamFansInfo();
teamFansInfo.setWorkerId(workerId);
teamFansInfo.setActiveTime(activeTime);
- save(teamFansInfo);
+ update(teamFansInfo);
}
@Override
@@ -327,7 +308,7 @@
} else {
teamFansInfo.setWeixinIdExist(true);
}
- save(teamFansInfo);
+ update(teamFansInfo);
}
@Override
@@ -336,7 +317,7 @@
TeamFansInfo teamFansInfo = new TeamFansInfo();
teamFansInfo.setWorkerId(workerId);
teamFansInfo.setInviteCode(inviteCode);
- save(teamFansInfo);
+ update(teamFansInfo);
}
@Override
@@ -345,7 +326,7 @@
TeamFansInfo teamFansInfo = new TeamFansInfo();
teamFansInfo.setWorkerId(workerId);
teamFansInfo.setPhone(phone);
- save(teamFansInfo);
+ update(teamFansInfo);
}
@Override
@@ -354,7 +335,7 @@
TeamFansInfo teamFansInfo = new TeamFansInfo();
teamFansInfo.setLevel(level);
teamFansInfo.setWorkerId(workerId);
- save(teamFansInfo);
+ update(teamFansInfo);
}
@Override
@@ -363,7 +344,7 @@
TeamFansInfo teamFansInfo = new TeamFansInfo();
teamFansInfo.setWorkerId(workerId);
teamFansInfo.setPhoneOpen(phoneOpen);
- save(teamFansInfo);
+ update(teamFansInfo);
}
@Override
@@ -377,7 +358,7 @@
teamFansInfo.setWorkerId(workerId);
teamFansInfo.setIncome(income.multiply(BigDecimal.valueOf(100)).setScale(0, BigDecimal.ROUND_DOWN).intValue());
teamFansInfo.setIncomeTime(new Date());
- save(teamFansInfo);
+ update(teamFansInfo);
}
@Override
@@ -389,8 +370,22 @@
TeamFansInfo teamFansInfo = new TeamFansInfo();
teamFansInfo.setWorkerId(workerId);
teamFansInfo.setFansNum(fansNum);
- save(teamFansInfo);
+ update(teamFansInfo);
}
+
+ private void update(TeamFansInfo record) {
+ if (record == null || record.getWorkerId() == null) {
+ return;
+ }
+ // 鏃犻個璇峰叧绯� 涓嶆搷浣�
+ ThreeSale threeSale = threeSaleSerivce.selectByWorkerId(record.getWorkerId());
+ if (threeSale == null)
+ return;
+
+ record.setId(record.getWorkerId().toString());
+ teamFansInfoDao.updateSelective(record);
+ }
+
@Override
public List<TeamFansInfo> query(int start, int count, int type, Long uid, ThreeSaleFocusDTO focusDTO) {
--
Gitblit v1.8.0