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/ThreeSaleSerivceImpl.java | 188 +++++++++++++++++------------------------------
1 files changed, 68 insertions(+), 120 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 2c50a8c..b8c591e 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
@@ -105,16 +105,6 @@
threeSale.setWorker(inviteeUser);
threeSaleMapper.insertSelective(threeSale);
- List<ThreeSale> listExpire = threeSaleMapper.getExpireRecord(inviter.getId(), inviteeUser.getId());
- if (listExpire != null && listExpire.size() > 0) {
- // 鍒犻櫎澶辨晥
- for (ThreeSale saleExpire : listExpire) {
- msgInviteDetailService.deleteByThreeSale(saleExpire);
- }
- // 鍒犻櫎宸插け鏁堝叧绯�
- threeSaleMapper.deleteExpireRecord(inviter.getId(), inviteeUser.getId());
- }
-
} else {// 鏄凡缁忓瓨鍦ㄧ殑鐢ㄦ埛
if (worker.getId().longValue() == inviter.getId())
throw new ThreeSaleException(4, "涓嶈兘缁戝畾鑷繁");
@@ -144,20 +134,6 @@
threeSale.setUpdateTime(java.lang.System.currentTimeMillis());
threeSale.setWorker(worker);
threeSaleMapper.insertSelective(threeSale);
-
- // 鍒犻櫎宸插け鏁堝叧绯�
- threeSaleMapper.deleteExpireRecord(inviter.getId(), worker.getId());
-
- List<ThreeSale> listExpire = threeSaleMapper.getExpireRecord(inviter.getId(), worker.getId());
- if (listExpire != null && listExpire.size() > 0) {
- // 鍒犻櫎鍘嗗彶閫氱煡
- for (ThreeSale saleExpire : listExpire) {
- msgInviteDetailService.deleteByThreeSale(saleExpire);
- }
- // 鍒犻櫎宸插け鏁堝叧绯�
- threeSaleMapper.deleteExpireRecord(inviter.getId(), worker.getId());
- }
-
} else {
// 杩樺瓨鍦ㄦ湁鏁堢殑閭�璇凤紝鍒欎笉鍋氬鐞�
}
@@ -233,23 +209,6 @@
}
@Override
- public long getFirstUsersCount(Long uid) {
- return threeSaleMapper.countFirstTeam(uid, null);
- }
-
- @Override
- public long getSecondUsersCount(Long uid) {
- return threeSaleMapper.countSecondTeam(uid, null);
- }
-
-
- @Override
- public int deleteByPrimaryKey(Long id) {
- return threeSaleMapper.deleteByPrimaryKey(id);
- }
-
-
- @Override
public List<ThreeSale> listFirstTeamQuery(long start, int count, Long uid, Integer state, String startTime,
String endTime, Integer validState) {
return threeSaleMapper.listFirstTeamQuery(start, count, uid, state, startTime, endTime, validState);
@@ -282,16 +241,6 @@
}
@Override
- public long countFirstTeam(Long uid, Integer state) {
- return threeSaleMapper.countFirstTeam(uid, state);
- }
-
- @Override
- public long countSecondTeam(Long uid, Integer state) {
- return threeSaleMapper.countSecondTeam(uid, state);
- }
-
- @Override
public ThreeSale getMyBoss(Long uid) {
return threeSaleMapper.getMyBoss(uid);
}
@@ -307,27 +256,22 @@
}
@Override
- public JSONObject getMyFirstTeam(long start, int count, Long uid, Integer state) {
-
- List<ThreeSale> list = threeSaleMapper.listFirstTeam(start, count, uid, state);
+ public JSONObject getMyFirstTeam(long start, int count, Long uid) {
+ List<ThreeSale> list = threeSaleMapper.listFirstTeam(start, count, uid, null);
if (list == null) {
list = new ArrayList<ThreeSale>();
}
-
- long countTotal = threeSaleMapper.countFirstTeam(uid, state);
-
+ long countTotal = threeSaleMapper.countFirstTeam(uid, null);
return organizeTeam(countTotal, list);
}
@Override
- public JSONObject getMySecondTeam(long start, int count, Long uid, Integer state) {
- List<ThreeSale> list = threeSaleMapper.listSecondTeam(start, count, uid, state);
+ public JSONObject getMySecondTeam(long start, int count, Long uid) {
+ List<ThreeSale> list = threeSaleMapper.listSecondTeam(start, count, uid, null);
if (list == null) {
list = new ArrayList<ThreeSale>();
}
-
- long countTotal = threeSaleMapper.countSecondTeam(uid, state);
-
+ long countTotal = threeSaleMapper.countSecondTeam(uid, null);
return organizeTeam(countTotal, list);
}
@@ -456,13 +400,12 @@
return threeSaleMapper.getSuccessRelationshipNum(uid);
}
-
@Override
@Transactional(rollbackFor = Exception.class)
public void bindInviteRelationship(Long workerId, Long bossId) throws ThreeSaleException {
if (workerId == null || bossId == null)
throw new ThreeSaleException(1, "鐢ㄦ埛淇℃伅涓虹┖");
-
+
// 鏂板缓绔嬬‘瀹氬叧绯�
ThreeSale threeSale = new ThreeSale();
threeSale.setBoss(new UserInfo(bossId));
@@ -484,7 +427,8 @@
@Transactional
private void inviteSuccess(Long workerId, Long bossId) {
if (!Constant.IS_TEST) {
- UserInviteMQMsg msg = new UserInviteMQMsg(bossId, workerId, null, new Date(), UserInviteMQMsg.STATE_SUCCESS);
+ UserInviteMQMsg msg = new UserInviteMQMsg(bossId, workerId, null, new Date(),
+ UserInviteMQMsg.STATE_SUCCESS);
Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteSuccess, msg);
producer.send(message);
}
@@ -497,19 +441,19 @@
} catch (Exception e) {
e.printStackTrace();
}
-
+
try {
// 鐩存帴绮変笣閭�璇锋垚鍔�
UserInfo invitee = userInfoService.selectByPKey(workerId);
userInviteMsgNotificationService.directInviteSuccess(bossId, invitee.getNickName(),
invitee.getPortrait(), new Date());
-
+
// 闂存帴绮変笣閭�璇锋垚鍔�
ThreeSale myBoss = threeSaleMapper.getMyBoss(bossId);
if (myBoss != null) {
UserInfo boss = userInfoService.selectByPKey(bossId);
- userInviteMsgNotificationService.indirectInviteSuccess(myBoss.getBoss().getId(),
- boss.getNickName(), invitee.getNickName(), invitee.getPortrait(), new Date());
+ userInviteMsgNotificationService.indirectInviteSuccess(myBoss.getBoss().getId(),
+ boss.getNickName(), invitee.getNickName(), invitee.getPortrait(), new Date());
}
} catch (Exception e) {
e.printStackTrace();
@@ -530,11 +474,6 @@
}
@Override
- public long countSuccessFirstTeam(Long uid) {
- return threeSaleMapper.countFirstTeam(uid, 1);
- }
-
- @Override
public ThreeSale selectByWorkerId(Long workerId) {
return threeSaleMapper.selectSuccessByWorkerId(workerId);
}
@@ -550,33 +489,53 @@
}
@Override
- public List<ThreeSale> listFirstTeam(long start, int count, Long uid, Integer state) {
- return threeSaleMapper.listFirstTeam(start, count, uid, state);
+ public List<ThreeSale> listFirstTeam(long start, int count, Long uid) {
+ return threeSaleMapper.listFirstTeam(start, count, uid, null);
}
@Override
- public List<ThreeSale> listFirstTeamByUndeleted(long start, int count, Long uid) {
- return threeSaleMapper.listFirstTeamByUndeleted(start, count, uid);
+ public List<ThreeSale> listSecondTeam(long start, int count, Long uid) {
+ return threeSaleMapper.listSecondTeam(start, count, uid, null);
}
@Override
- public long countFirstTeamByUndeleted(Long uid) {
- return threeSaleMapper.countFirstTeamByUndeleted(uid);
+ public List<ThreeSale> listFirstTeam(long start, int count, Long uid, List<Long> listId) {
+ return threeSaleMapper.listFirstTeam(start, count, uid, listId);
}
@Override
- public List<ThreeSale> listSecondTeamByUndeleted(long start, int count, Long uid) {
- return threeSaleMapper.listSecondTeamByUndeleted(start, count, uid);
+ public List<ThreeSale> listSecondTeam(long start, int count, Long uid, List<Long> listId) {
+ return threeSaleMapper.listSecondTeam(start, count, uid, listId);
}
@Override
- public long countSecondTeamByUndeleted(Long uid) {
- return threeSaleMapper.countSecondTeamByUndeleted(uid);
+ public long countFirstTeam(Long uid) {
+ return threeSaleMapper.countFirstTeam(uid, null);
}
@Override
- public List<ThreeSale> listSecondTeam(long start, int count, Long uid, Integer state) {
- return threeSaleMapper.listSecondTeam(start, count, uid, state);
+ public long countSecondTeam(Long uid) {
+ return threeSaleMapper.countSecondTeam(uid, null);
+ }
+
+ @Override
+ public long countFirstTeam(Long uid, List<Long> listId) {
+ return threeSaleMapper.countFirstTeam(uid, listId);
+ }
+
+ @Override
+ public long countSecondTeam(Long uid, List<Long> listId) {
+ return threeSaleMapper.countSecondTeam(uid, listId);
+ }
+
+ @Override
+ public long countFirstTeamByDate(Long uid, int dayType) {
+ return threeSaleMapper.countFirstTeamByDate(uid, dayType);
+ }
+
+ @Override
+ public long countSecondTeamByDate(Long uid, int dayType) {
+ return threeSaleMapper.countSecondTeamByDate(uid, dayType);
}
@Override
@@ -620,48 +579,37 @@
@Override
public List<ThreeSale> getMyBossDeepList(Long uid) {
- //TODO 闇�瑕佹洿鍔犵畝渚跨殑鏂瑰紡澶勭悊
+ // TODO 闇�瑕佹洿鍔犵畝渚跨殑鏂瑰紡澶勭悊
return getMyBossDeepList(uid, 100);
}
@Override
- public void remvoeBreak(Long id, Long uid, Long tid) {
- ThreeSale threeSale = threeSaleMapper.selectByPrimaryKey(id);
- if (threeSale == null) {
- return;
+ public Long getTopBoss(Long uid) {
+ Long bossUid = null;
+ UserInfo boss = getBoss(uid);
+ while (boss != null) {
+ bossUid = boss.getId();
+ boss = getBoss(boss.getId());
}
+ return bossUid;
+ }
- Long workerId = threeSale.getWorker().getId();
- if (tid.longValue() != workerId.longValue()) {
- return;
- }
+ @Override
+ public List<ThreeSale> listAll(Date minTime, Date maxTime, int page, int pageSize) {
+ return threeSaleMapper.listAll(minTime == null ? null : minTime.getTime(),
+ maxTime == null ? null : maxTime.getTime(), (page - 1) * pageSize, pageSize);
+ }
- Integer expire = threeSale.getExpire();
- if (expire == ThreeSale.EXPIRE_NORMAL) {
- return;
- }
+ @Override
+ public long countAll(Date minTime, Date maxTime) {
+ return threeSaleMapper.countAll(minTime == null ? null : minTime.getTime(),
+ maxTime == null ? null : maxTime.getTime());
+ }
- int upExpire = expire;
- Long bossId = threeSale.getBoss().getId();
- if (bossId.longValue() == uid.longValue()) { // 鐩存帴绮変笣
- if (expire == ThreeSale.EXPIRE_BREAK_VIP_DEL4) {
- upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL34;
- } else {
- upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL3;
- }
- } else { // 闂存帴绮変笣
- if (expire == ThreeSale.EXPIRE_BREAK_VIP_DEL3) {
- upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL34;
- } else {
- upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL4;
- }
- }
-
- ThreeSale update = new ThreeSale();
- update.setId(id);
- update.setExpire(upExpire);
- update.setUpdateTime(java.lang.System.currentTimeMillis());
- threeSaleMapper.updateByPrimaryKeySelective(update);
+
+ @Override
+ public List<Long> getAllBossId(){
+ return threeSaleMapper.getAllBossId();
}
}
--
Gitblit v1.8.0