|
|
@@ -340,7 +340,10 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>().eq(SysDept::getId, sysAgencyLeaderVo.getDeptId()).eq(SysDept::getDelFlag, 0));
|
|
|
if (sysDept != null) {
|
|
|
sysAgencyLeaderVo.setParentId(sysDept.getParentId());
|
|
|
+ sysAgencyLeaderVo.setDeptName(sysDept.getName());
|
|
|
}
|
|
|
+ SysUser sysUser = sysUserMapper.selectById(sysAgencyLeaderVo.getUserId());
|
|
|
+ sysAgencyLeaderVo.setUserName(sysUser.getName());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -354,7 +357,8 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
sysAgencyLeader.setId(id);
|
|
|
SysAgencyLeader sysAgencyLeader1 = sysAgencyLeaderMapper.selectById(sysAgencyLeader);
|
|
|
SysAgencyLeaderVo sysAgencyLeaderVo = BeanUtil.copyProperties(sysAgencyLeader1, SysAgencyLeaderVo.class);
|
|
|
-
|
|
|
+ SysUser sysUser = sysUserMapper.selectById(sysAgencyLeaderVo.getUserId());
|
|
|
+ sysAgencyLeaderVo.setUserName(sysUser.getName());
|
|
|
return sysAgencyLeaderVo;
|
|
|
}
|
|
|
|
|
|
@@ -686,11 +690,12 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
|
|
|
BigDecimal bigDecimal = BigDecimal.ZERO;
|
|
|
//已提现抽成费用
|
|
|
BigDecimal historyFee = BigDecimal.ZERO;
|
|
|
-
|
|
|
+ SysUser sysUser = sysUserMapper.selectById(sysAgencyLeaders.getUserId());
|
|
|
+ SysDept sysDept = sysDeptMapper.selectById(sysAgencyLeaders.getDeptId());
|
|
|
agencyExtractFee.setUserId(sysAgencyLeaders.getUserId());
|
|
|
- agencyExtractFee.setUserName(sysAgencyLeaders.getUserName());
|
|
|
+ agencyExtractFee.setUserName(sysUser.getName());
|
|
|
agencyExtractFee.setDeptId(sysAgencyLeaders.getDeptId());
|
|
|
- agencyExtractFee.setDeptName(sysAgencyLeaders.getDeptName());
|
|
|
+ agencyExtractFee.setDeptName(sysDept.getName());
|
|
|
agencyExtractFee.setProportional(sysAgencyLeaders.getProportional());
|
|
|
//筛选订单,选择时间
|
|
|
Date updateTime = sysAgencyLeaders.getUpdateTime();
|