From 1151bde4c247b3801f7ab750c7abcc79a6514e10 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 11 四月 2020 09:21:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 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 2ed0593..07bb037 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
@@ -611,23 +611,22 @@
public List<ThreeSale> listFirstTeamByUndeleted(long start, int count, Long uid) {
return threeSaleMapper.listFirstTeamByUndeleted(start, count, uid);
}
-
+
@Override
public long countFirstTeamByUndeleted(Long uid) {
return threeSaleMapper.countFirstTeamByUndeleted(uid);
}
-
+
@Override
public List<ThreeSale> listSecondTeamByUndeleted(long start, int count, Long uid) {
return threeSaleMapper.listSecondTeamByUndeleted(start, count, uid);
}
-
+
@Override
public long countSecondTeamByUndeleted(Long uid) {
return threeSaleMapper.countSecondTeamByUndeleted(uid);
}
-
-
+
@Override
public List<ThreeSale> listSecondTeam(long start, int count, Long uid, Integer state) {
return threeSaleMapper.listSecondTeam(start, count, uid, state);
@@ -671,8 +670,12 @@
return deepList;
}
-
-
+
+ @Override
+ public List<ThreeSale> getMyBossDeepList(Long uid) {
+ //TODO 闇�瑕佹洿鍔犵畝渚跨殑鏂瑰紡澶勭悊
+ return getMyBossDeepList(uid, 100);
+ }
@Override
public void remvoeBreak(Long id, Long uid, Long tid) {
@@ -680,33 +683,33 @@
if (threeSale == null) {
return;
}
-
+
Long workerId = threeSale.getWorker().getId();
if (tid.longValue() != workerId.longValue()) {
return;
}
-
+
Integer expire = threeSale.getExpire();
if (expire == ThreeSale.EXPIRE_NORMAL) {
return;
}
-
+
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;
+ 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;
+ upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL34;
} else {
upExpire = ThreeSale.EXPIRE_BREAK_VIP_DEL4;
}
}
-
+
ThreeSale update = new ThreeSale();
update.setId(id);
update.setExpire(upExpire);
--
Gitblit v1.8.0