From 8142bc75187743fb60e222a3214b906f76b2415c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 14 十二月 2019 09:53:03 +0800
Subject: [PATCH] 邀请进度
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
index 6411fd8..d240330 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
@@ -336,13 +336,13 @@
@Override
- public List<RedPackWinProgressVO> getInviteProgressByWorkerId(Long uid) {
+ public List<RedPackWinProgressVO> getInviteProgressByWorkerId(Long uid, Long tid) {
List<RedPackWinProgressVO> listVO = new ArrayList<RedPackWinProgressVO>();
- ThreeSale threeSale = threeSaleSerivce.selectByWorkerId(uid);
+ ThreeSale threeSale = threeSaleSerivce.getNearRelationByBossIdAndWorkerId(uid, tid);
if (threeSale == null || threeSale.getSucceedTime() == null)
return listVO;
- UserInfo userInfo = userInfoService.selectByPKey(uid);
+ UserInfo userInfo = userInfoService.selectByPKey(tid);
if (userInfo == null)
return listVO;
@@ -350,7 +350,7 @@
listVO.add(new RedPackWinProgressVO("纭珛閭�璇�", TimeUtil.formatDate(threeSale.getSucceedTime())));
// 濂栧姳璁板綍
- List<RedPackWinInvite> listWin = redPackWinInviteMapper.getWinListByBossIdAndTeamUid(threeSale.getBoss().getId(), uid);
+ List<RedPackWinInvite> listWin = redPackWinInviteMapper.getWinListByBossIdAndTeamUid(uid, tid);
if (listWin == null || listWin.size() == 0)
return listVO;
@@ -368,7 +368,7 @@
continue;
}
- if (win.getType() == RedPackWinInviteTypeEnum.twoStageReward) {
+ if (win.getType() == RedPackWinInviteTypeEnum.threeStageReward) {
listVO.add(new RedPackWinProgressVO("绗笁闃舵绗�" + month + "涓湀", time, money.toString()));
month ++;
continue;
--
Gitblit v1.8.0