|
@@ -1495,15 +1495,15 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
|
|
|
|
|
PartnerInfoVo partnerInfoVo = new PartnerInfoVo();
|
|
PartnerInfoVo partnerInfoVo = new PartnerInfoVo();
|
|
|
|
|
|
|
|
- String id = sysPartner.getUserId();
|
|
|
|
|
|
|
+ String id = partner.getUserId();
|
|
|
partnerInfoVo.setUserId(id);
|
|
partnerInfoVo.setUserId(id);
|
|
|
SysUser sysUser = sysUserMapper.selectById(id);
|
|
SysUser sysUser = sysUserMapper.selectById(id);
|
|
|
partnerInfoVo.setUserName(sysUser.getName());
|
|
partnerInfoVo.setUserName(sysUser.getName());
|
|
|
- SysUser sysUser1 = sysUserMapper.selectById(sysPartner.getSuggestId());
|
|
|
|
|
|
|
+ SysUser sysUser1 = sysUserMapper.selectById(partner.getSuggestId());
|
|
|
partnerInfoVo.setSuggestName(sysUser1.getName());
|
|
partnerInfoVo.setSuggestName(sysUser1.getName());
|
|
|
//费用
|
|
//费用
|
|
|
List<SysPremiumDetails> sysPremiumDetail = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
|
|
List<SysPremiumDetails> sysPremiumDetail = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
|
|
|
- .eq(SysPremiumDetails::getUserId, userId)
|
|
|
|
|
|
|
+ .eq(SysPremiumDetails::getUserId, id)
|
|
|
.between(StringUtils.isNotEmpty(filterPartnerInfoDto.getBeginTime()) && StringUtils.isNotEmpty(filterPartnerInfoDto.getEndTime()),
|
|
.between(StringUtils.isNotEmpty(filterPartnerInfoDto.getBeginTime()) && StringUtils.isNotEmpty(filterPartnerInfoDto.getEndTime()),
|
|
|
SysPremiumDetails::getCreateTime, filterPartnerInfoDto.getBeginTime(), filterPartnerInfoDto.getEndTime())
|
|
SysPremiumDetails::getCreateTime, filterPartnerInfoDto.getBeginTime(), filterPartnerInfoDto.getEndTime())
|
|
|
.eq(SysPremiumDetails::getStatus, 1)
|
|
.eq(SysPremiumDetails::getStatus, 1)
|
|
@@ -1514,7 +1514,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
partnerInfoVo.setExtractFee(extractFee1);
|
|
partnerInfoVo.setExtractFee(extractFee1);
|
|
|
//直接合伙人
|
|
//直接合伙人
|
|
|
List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
|
|
List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
|
|
|
- .eq(SysRelationPerson::getSuggestId, userId)
|
|
|
|
|
|
|
+ .eq(SysRelationPerson::getSuggestId, id)
|
|
|
.eq(SysRelationPerson::getDelFlag, 1)
|
|
.eq(SysRelationPerson::getDelFlag, 1)
|
|
|
.eq(SysRelationPerson::getType, 0)
|
|
.eq(SysRelationPerson::getType, 0)
|
|
|
.eq(SysRelationPerson::getSource, 0));
|
|
.eq(SysRelationPerson::getSource, 0));
|
|
@@ -1523,7 +1523,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
|
|
|
|
|
//直接管理员
|
|
//直接管理员
|
|
|
List<SysRelationPerson> sysRelationPersonList1 = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
|
|
List<SysRelationPerson> sysRelationPersonList1 = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
|
|
|
- .eq(SysRelationPerson::getSuggestId, userId)
|
|
|
|
|
|
|
+ .eq(SysRelationPerson::getSuggestId, id)
|
|
|
.eq(SysRelationPerson::getDelFlag, 1)
|
|
.eq(SysRelationPerson::getDelFlag, 1)
|
|
|
.eq(SysRelationPerson::getType, 1)
|
|
.eq(SysRelationPerson::getType, 1)
|
|
|
.eq(SysRelationPerson::getSource, 0));
|
|
.eq(SysRelationPerson::getSource, 0));
|
|
@@ -1535,7 +1535,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
|
|
|
|
|
//工作室数
|
|
//工作室数
|
|
|
List<SysRelationPerson> sysRelationPersonList2 = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
|
|
List<SysRelationPerson> sysRelationPersonList2 = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
|
|
|
- .eq(SysRelationPerson::getSuggestId, userId)
|
|
|
|
|
|
|
+ .eq(SysRelationPerson::getSuggestId, id)
|
|
|
.eq(SysRelationPerson::getDelFlag, 1)
|
|
.eq(SysRelationPerson::getDelFlag, 1)
|
|
|
.eq(SysRelationPerson::getType, 1));
|
|
.eq(SysRelationPerson::getType, 1));
|
|
|
|
|
|