From d22d18f40d088277195e5c3ab587d07450f1a94d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 四月 2020 18:22:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java | 40 ++++++++++------------------------------
1 files changed, 10 insertions(+), 30 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 08ed101..2c50a8c 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
@@ -242,25 +242,6 @@
return threeSaleMapper.countSecondTeam(uid, null);
}
- @Override
- public List<ThreeSale> queryMyFirstTeamList(int start, int count, String key, Long bossId) {
- return threeSaleMapper.queryMyFirstTeamList(start, count, key, bossId);
- }
-
- @Override
- public long queryCountMyFirstTeamList(String key, Long bossId) {
- return threeSaleMapper.queryCountMyFirstTeamList(key, bossId);
- }
-
- @Override
- public List<ThreeSale> queryMySecondTeamList(int start, int count, String key, Long bossId) {
- return threeSaleMapper.queryMySecondTeamList(start, count, key, bossId);
- }
-
- @Override
- public long queryCountMySecondTeamList(String key, Long bossId) {
- return threeSaleMapper.queryCountMySecondTeamList(key, bossId);
- }
@Override
public int deleteByPrimaryKey(Long id) {
@@ -268,27 +249,26 @@
}
-
@Override
public List<ThreeSale> listFirstTeamQuery(long start, int count, Long uid, Integer state, String startTime,
- String endTime) {
- return threeSaleMapper.listFirstTeamQuery(start, count, uid, state, startTime, endTime);
+ String endTime, Integer validState) {
+ return threeSaleMapper.listFirstTeamQuery(start, count, uid, state, startTime, endTime, validState);
}
@Override
- public long countFirstTeamQuery(Long uid, Integer state, String startTime, String endTime) {
- return threeSaleMapper.countFirstTeamQuery(uid, state, startTime, endTime);
+ public long countFirstTeamQuery(Long uid, Integer state, String startTime, String endTime, Integer validState) {
+ return threeSaleMapper.countFirstTeamQuery(uid, state, startTime, endTime, validState);
}
@Override
public List<ThreeSale> listSecondTeamQuery(long start, int count, Long uid, Integer state, String startTime,
- String endTime) {
- return threeSaleMapper.listSecondTeamQuery(start, count, uid, state, startTime, endTime);
+ String endTime, Integer validState) {
+ return threeSaleMapper.listSecondTeamQuery(start, count, uid, state, startTime, endTime, validState);
}
@Override
- public long countSecondTeamQuery(Long uid, Integer state, String startTime, String endTime) {
- return threeSaleMapper.countSecondTeamQuery(uid, state, startTime, endTime);
+ public long countSecondTeamQuery(Long uid, Integer state, String startTime, String endTime, Integer validState) {
+ return threeSaleMapper.countSecondTeamQuery(uid, state, startTime, endTime, validState);
}
@Override
@@ -528,8 +508,8 @@
ThreeSale myBoss = threeSaleMapper.getMyBoss(bossId);
if (myBoss != null) {
UserInfo boss = userInfoService.selectByPKey(bossId);
- userInviteMsgNotificationService.indirectInviteSuccess(bossId, 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();
--
Gitblit v1.8.0