|
|
@@ -881,7 +881,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
.between(StringUtils.isNotEmpty(partnerInfoDto.getBeginTime()) && StringUtils.isNotEmpty(partnerInfoDto.getEndTime()),
|
|
|
SysPremiumDetails::getCreateTime, partnerInfoDto.getBeginTime(), partnerInfoDto.getEndTime())
|
|
|
.eq(partnerInfoDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerInfoDto.getIndustrySector())
|
|
|
- .eq(SysPremiumDetails::getStatus,1));
|
|
|
+ .eq(SysPremiumDetails::getStatus, 1));
|
|
|
BigDecimal sumPremium = sysPremiumDetails.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
BigDecimal extractFee = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
|
|
|
@@ -945,12 +945,24 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
return appSysPartnerVos;
|
|
|
|
|
|
}
|
|
|
- for (Integer integer : listMap.keySet()) {
|
|
|
+ int start = 0;
|
|
|
+ int type = sysPartner.getType();
|
|
|
+ if (type == 1) {
|
|
|
+ start = start + 2;
|
|
|
+ }else if (type == 2) {
|
|
|
+ start = start + 3;
|
|
|
+ }else if (type == 3) {
|
|
|
+ start = start + 4;
|
|
|
+ }else if (type == 4) {
|
|
|
+ start = start + 5;
|
|
|
+ }
|
|
|
+
|
|
|
+ for (int i = start; i < 6; i++) {
|
|
|
//二级
|
|
|
- List<SysPartner> sysPartnerList1 = listMap.get(integer);
|
|
|
- if (sysPartnerList1.size() > 0) {
|
|
|
+ List<SysPartner> sysPartnerList1 = listMap.get(i);
|
|
|
+ if (CollectionUtil.isNotEmpty(sysPartnerList1)) {
|
|
|
AppSysPartnerVo appSysPartnerVo = new AppSysPartnerVo();
|
|
|
- appSysPartnerVo.setPartnerType(integer);
|
|
|
+ appSysPartnerVo.setPartnerType(i);
|
|
|
//下级合伙人数
|
|
|
appSysPartnerVo.setPartnerNumber(sysPartnerList1.size());
|
|
|
List<String> ids = sysPartnerList1.stream().map(SysPartner::getUserId).collect(Collectors.toList());
|
|
|
@@ -960,7 +972,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
.between(StringUtils.isNotEmpty(partnerInfoDto.getBeginTime()) && StringUtils.isNotEmpty(partnerInfoDto.getEndTime()),
|
|
|
SysPremiumDetails::getCreateTime, partnerInfoDto.getBeginTime(), partnerInfoDto.getEndTime())
|
|
|
.eq(partnerInfoDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerInfoDto.getIndustrySector())
|
|
|
- .eq(SysPremiumDetails::getStatus,1));
|
|
|
+ .eq(SysPremiumDetails::getStatus, 1));
|
|
|
BigDecimal sumPremium = sysPremiumDetails.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
BigDecimal extractFee = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
|
|
|
@@ -994,101 +1006,136 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
}
|
|
|
|
|
|
List<String> list = new ArrayList<>();
|
|
|
- int type = sysPartner.getType();
|
|
|
+// int type = sysPartner.getType();
|
|
|
if (type == 1) {
|
|
|
- if (integer == 2) {
|
|
|
+ if (i == 2) {
|
|
|
+ //一级获取登陆人的之际工作室
|
|
|
+ list.add(userId);
|
|
|
+ extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
+ } else {
|
|
|
+ extractedLeader(partnerInfoDto, listMap, i, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
+ }
|
|
|
+ } else if (type == 2) {
|
|
|
+ if (i == 3) {
|
|
|
+ //一级获取登陆人的之际工作室
|
|
|
+ list.add(userId);
|
|
|
+ extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
+ } else {
|
|
|
+ //获取上一级合伙人,查询工作室数量
|
|
|
+ extractedLeader(partnerInfoDto, listMap, i, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
+ }
|
|
|
+
|
|
|
+ } else if (type == 3) {
|
|
|
+ if (i == 4) {
|
|
|
//一级获取登陆人的之际工作室
|
|
|
list.add(userId);
|
|
|
extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
} else {
|
|
|
|
|
|
//获取上一级合伙人,查询工作室数量
|
|
|
- List<SysPartner> sysPartners = listMap.get(integer - 1);
|
|
|
+ extractedLeader(partnerInfoDto, listMap, i, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
+ }
|
|
|
+
|
|
|
+ } else if (type == 4) {
|
|
|
+ if (i == 5) {
|
|
|
+ //一级获取登陆人的之际工作室
|
|
|
+ list.add(userId);
|
|
|
+ extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
+ } else {
|
|
|
+ //获取上一级合伙人,查询工作室数量
|
|
|
+ extractedLeader(partnerInfoDto, listMap, i, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ //每一级存入map
|
|
|
+ appSysPartnerVos.add(appSysPartnerVo);
|
|
|
+ } else {
|
|
|
+ //无合伙人,查看上一级的直接工作室
|
|
|
+ List<String> list = new ArrayList<>();
|
|
|
+ AppSysPartnerVo appSysPartnerVo = new AppSysPartnerVo();
|
|
|
+ appSysPartnerVo.setPartnerType(i);
|
|
|
+ if (type == 1) {
|
|
|
+ if (i == 2) {
|
|
|
+ //一级获取登陆人的之际工作室
|
|
|
+ list.add(userId);
|
|
|
+ extracted(partnerInfoDto, appSysPartnerVo, BigDecimal.ZERO, BigDecimal.ZERO, 0, list);
|
|
|
+ } else {
|
|
|
+ //获取上一级合伙人,查询工作室数量
|
|
|
+ List<SysPartner> sysPartners = listMap.get(i - 1);
|
|
|
if (sysPartners != null) {
|
|
|
//上一级直接推荐的工作室数量
|
|
|
List<String> list1 = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
|
|
|
list.addAll(list1);
|
|
|
- extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
- } else {
|
|
|
- appSysPartnerVo.setTeamManNum(deptManNum);
|
|
|
-
|
|
|
- appSysPartnerVo.setNumber(appSysPartnerVo.getPartnerNumber());
|
|
|
+ extracted(partnerInfoDto, appSysPartnerVo, BigDecimal.ZERO, BigDecimal.ZERO, 0, list);
|
|
|
}
|
|
|
}
|
|
|
- } else if (type == 2) {
|
|
|
- if (integer == 3) {
|
|
|
+ }else if (type == 2) {
|
|
|
+ if (i == 3) {
|
|
|
//一级获取登陆人的之际工作室
|
|
|
list.add(userId);
|
|
|
- extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
+ extracted(partnerInfoDto, appSysPartnerVo, BigDecimal.ZERO, BigDecimal.ZERO, 0, list);
|
|
|
} else {
|
|
|
//获取上一级合伙人,查询工作室数量
|
|
|
- List<SysPartner> sysPartners = listMap.get(integer - 1);
|
|
|
+ List<SysPartner> sysPartners = listMap.get(i - 1);
|
|
|
if (sysPartners != null) {
|
|
|
//上一级直接推荐的工作室数量
|
|
|
List<String> list1 = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
|
|
|
list.addAll(list1);
|
|
|
- extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
- } else {
|
|
|
- appSysPartnerVo.setTeamManNum(deptManNum);
|
|
|
-
|
|
|
- appSysPartnerVo.setNumber(appSysPartnerVo.getPartnerNumber());
|
|
|
+ extracted(partnerInfoDto, appSysPartnerVo, BigDecimal.ZERO, BigDecimal.ZERO, 0, list);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- } else if (type == 3) {
|
|
|
- if (integer == 4) {
|
|
|
+ }else if (type == 3) {
|
|
|
+ if (i == 4) {
|
|
|
//一级获取登陆人的之际工作室
|
|
|
list.add(userId);
|
|
|
- extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
+ extracted(partnerInfoDto, appSysPartnerVo, BigDecimal.ZERO, BigDecimal.ZERO, 0, list);
|
|
|
} else {
|
|
|
-
|
|
|
//获取上一级合伙人,查询工作室数量
|
|
|
- List<SysPartner> sysPartners = listMap.get(integer - 1);
|
|
|
+ List<SysPartner> sysPartners = listMap.get(i - 1);
|
|
|
if (sysPartners != null) {
|
|
|
//上一级直接推荐的工作室数量
|
|
|
List<String> list1 = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
|
|
|
list.addAll(list1);
|
|
|
- extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
- } else {
|
|
|
- appSysPartnerVo.setTeamManNum(deptManNum);
|
|
|
-
|
|
|
- appSysPartnerVo.setNumber(appSysPartnerVo.getPartnerNumber());
|
|
|
+ extracted(partnerInfoDto, appSysPartnerVo, BigDecimal.ZERO, BigDecimal.ZERO, 0, list);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- } else if (type == 4) {
|
|
|
- if (integer == 5) {
|
|
|
+ }else if (type == 4) {
|
|
|
+ if (i == 5) {
|
|
|
//一级获取登陆人的之际工作室
|
|
|
list.add(userId);
|
|
|
- extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
+ extracted(partnerInfoDto, appSysPartnerVo, BigDecimal.ZERO, BigDecimal.ZERO, 0, list);
|
|
|
} else {
|
|
|
//获取上一级合伙人,查询工作室数量
|
|
|
- List<SysPartner> sysPartners = listMap.get(integer - 1);
|
|
|
+ List<SysPartner> sysPartners = listMap.get(i - 1);
|
|
|
if (sysPartners != null) {
|
|
|
//上一级直接推荐的工作室数量
|
|
|
List<String> list1 = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
|
|
|
list.addAll(list1);
|
|
|
- extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
- } else {
|
|
|
- appSysPartnerVo.setTeamManNum(deptManNum);
|
|
|
-
|
|
|
- appSysPartnerVo.setNumber(appSysPartnerVo.getPartnerNumber());
|
|
|
+ extracted(partnerInfoDto, appSysPartnerVo, BigDecimal.ZERO, BigDecimal.ZERO, 0, list);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
-// extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
-
|
|
|
- //每一级存入map
|
|
|
appSysPartnerVos.add(appSysPartnerVo);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
return appSysPartnerVos;
|
|
|
}
|
|
|
|
|
|
+ private void extractedLeader(PartnerInfoDto partnerInfoDto, Map<Integer, List<SysPartner>> listMap, int i, AppSysPartnerVo appSysPartnerVo, BigDecimal sumPremium, BigDecimal extractFee, int deptManNum, List<String> list) {
|
|
|
+ //获取上一级合伙人,查询工作室数量
|
|
|
+ List<SysPartner> sysPartners = listMap.get(i - 1);
|
|
|
+ if (sysPartners != null) {
|
|
|
+ //上一级直接推荐的工作室数量
|
|
|
+ List<String> list1 = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
|
|
|
+ list.addAll(list1);
|
|
|
+ extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
|
|
|
+ } else {
|
|
|
+ appSysPartnerVo.setTeamManNum(deptManNum);
|
|
|
+ appSysPartnerVo.setNumber(Optional.ofNullable(appSysPartnerVo.getPartnerNumber()).orElse(0));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private void extracted(PartnerInfoDto partnerInfoDto, AppSysPartnerVo appSysPartnerVo, BigDecimal sumPremium, BigDecimal extractFee, int deptManNum, List<String> list) {
|
|
|
List<SysRelationPerson> sysRelationPersons = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
|
|
|
.in(CollectionUtil.isNotEmpty(list), SysRelationPerson::getSuggestId, list)
|
|
|
@@ -1106,7 +1153,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
.between(StringUtils.isNotEmpty(partnerInfoDto.getBeginTime()) && StringUtils.isNotEmpty(partnerInfoDto.getEndTime()),
|
|
|
SysPremiumDetails::getCreateTime, partnerInfoDto.getBeginTime(), partnerInfoDto.getEndTime())
|
|
|
.eq(partnerInfoDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerInfoDto.getIndustrySector())
|
|
|
- .eq(SysPremiumDetails::getStatus,1));
|
|
|
+ .eq(SysPremiumDetails::getStatus, 1));
|
|
|
if (sysPremiumDetails1.size() > 0) {
|
|
|
|
|
|
BigDecimal sumPremium1 = sysPremiumDetails1.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
@@ -1142,8 +1189,9 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
}
|
|
|
|
|
|
appSysPartnerVo.setTeamManNum(deptManNum + leaderManNum);
|
|
|
-
|
|
|
- appSysPartnerVo.setNumber(appSysPartnerVo.getPartnerNumber() + appSysPartnerVo.getWorkNumber());
|
|
|
+ Integer partnerNumber = Optional.ofNullable(appSysPartnerVo.getPartnerNumber()).orElse(0);
|
|
|
+ Integer workNumber = Optional.ofNullable(appSysPartnerVo.getWorkNumber()).orElse(0);
|
|
|
+ appSysPartnerVo.setNumber(partnerNumber + workNumber);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1164,7 +1212,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
.between(StringUtils.isNotEmpty(partnerGradeInfo.getBeginTime()) && StringUtils.isNotEmpty(partnerGradeInfo.getEndTime()),
|
|
|
SysPremiumDetails::getCreateTime, partnerGradeInfo.getBeginTime(), partnerGradeInfo.getEndTime())
|
|
|
.eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector())
|
|
|
- .eq(SysPremiumDetails::getStatus,1));
|
|
|
+ .eq(SysPremiumDetails::getStatus, 1));
|
|
|
BigDecimal sumPremium = sysPremiumDetails.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
BigDecimal extractFee = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
partnerInfoFreeVo.setSumPremium(sumPremium);
|
|
|
@@ -1188,7 +1236,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
.eq(SysPremiumDetails::getUserId, userId)
|
|
|
.between(StringUtils.isNotEmpty(partnerGradeInfo.getBeginTime()) && StringUtils.isNotEmpty(partnerGradeInfo.getEndTime()),
|
|
|
SysPremiumDetails::getCreateTime, partnerGradeInfo.getBeginTime(), partnerGradeInfo.getEndTime())
|
|
|
- .eq(SysPremiumDetails::getStatus,1)
|
|
|
+ .eq(SysPremiumDetails::getStatus, 1)
|
|
|
.eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector()));
|
|
|
BigDecimal sumPremium1 = sysPremiumDetail.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
BigDecimal extractFee1 = sysPremiumDetail.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
@@ -1262,7 +1310,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
.in(SysPremiumDetails::getUserId, leaderIds)
|
|
|
.between(StringUtils.isNotEmpty(partnerGradeInfo.getBeginTime()) && StringUtils.isNotEmpty(partnerGradeInfo.getEndTime()),
|
|
|
SysPremiumDetails::getCreateTime, partnerGradeInfo.getBeginTime(), partnerGradeInfo.getEndTime())
|
|
|
- .eq(SysPremiumDetails::getStatus,1)
|
|
|
+ .eq(SysPremiumDetails::getStatus, 1)
|
|
|
.eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector()));
|
|
|
BigDecimal sumPremium = sysPremiumDetails.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
BigDecimal extractFee = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
@@ -1288,7 +1336,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
.eq(SysPremiumDetails::getUserId, userId)
|
|
|
.between(StringUtils.isNotEmpty(partnerGradeInfo.getBeginTime()) && StringUtils.isNotEmpty(partnerGradeInfo.getEndTime()),
|
|
|
SysPremiumDetails::getCreateTime, partnerGradeInfo.getBeginTime(), partnerGradeInfo.getEndTime())
|
|
|
- .eq(SysPremiumDetails::getStatus,1)
|
|
|
+ .eq(SysPremiumDetails::getStatus, 1)
|
|
|
.eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector()));
|
|
|
BigDecimal sumPremium1 = sysPremiumDetail.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
BigDecimal extractFee1 = sysPremiumDetail.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
@@ -1360,7 +1408,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
.in(SysPremiumDetails::getUserId, userIds)
|
|
|
.between(StringUtils.isNotEmpty(teamUserInfosDto.getBeginTime()) && StringUtils.isNotEmpty(teamUserInfosDto.getEndTime()),
|
|
|
SysPremiumDetails::getCreateTime, teamUserInfosDto.getBeginTime(), teamUserInfosDto.getEndTime())
|
|
|
- .eq(SysPremiumDetails::getStatus,1)
|
|
|
+ .eq(SysPremiumDetails::getStatus, 1)
|
|
|
.eq(teamUserInfosDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, teamUserInfosDto.getIndustrySector()));
|
|
|
BigDecimal sumPremium = sysPremiumDetails.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
teamUserInfosFreeVo.setSumPremium(sumPremium);
|
|
|
@@ -1390,7 +1438,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
.eq(SysPremiumDetails::getUserId, sysUser.getId())
|
|
|
.between(StringUtils.isNotEmpty(teamUserInfosDto.getBeginTime()) && StringUtils.isNotEmpty(teamUserInfosDto.getEndTime()),
|
|
|
SysPremiumDetails::getCreateTime, teamUserInfosDto.getBeginTime(), teamUserInfosDto.getEndTime())
|
|
|
- .eq(SysPremiumDetails::getStatus,1)
|
|
|
+ .eq(SysPremiumDetails::getStatus, 1)
|
|
|
.eq(teamUserInfosDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, teamUserInfosDto.getIndustrySector()));
|
|
|
BigDecimal sumPremium1 = sysPremiumDetail.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
teamUserInfosVo.setSumPremium(sumPremium1);
|
|
|
@@ -1433,7 +1481,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
.in(CollectionUtil.isNotEmpty(collect1), SysPremiumDetails::getUserId, collect1)
|
|
|
.between(StringUtils.isNotEmpty(filterPartnerInfoDto.getBeginTime()) && StringUtils.isNotEmpty(filterPartnerInfoDto.getEndTime()),
|
|
|
SysPremiumDetails::getCreateTime, filterPartnerInfoDto.getBeginTime(), filterPartnerInfoDto.getEndTime())
|
|
|
- .eq(SysPremiumDetails::getStatus,1)
|
|
|
+ .eq(SysPremiumDetails::getStatus, 1)
|
|
|
.eq(filterPartnerInfoDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, filterPartnerInfoDto.getIndustrySector()));
|
|
|
BigDecimal sumPremium = sysPremiumDetails.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
BigDecimal extractFee = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
@@ -1458,7 +1506,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
.eq(SysPremiumDetails::getUserId, userId)
|
|
|
.between(StringUtils.isNotEmpty(filterPartnerInfoDto.getBeginTime()) && StringUtils.isNotEmpty(filterPartnerInfoDto.getEndTime()),
|
|
|
SysPremiumDetails::getCreateTime, filterPartnerInfoDto.getBeginTime(), filterPartnerInfoDto.getEndTime())
|
|
|
- .eq(SysPremiumDetails::getStatus,1)
|
|
|
+ .eq(SysPremiumDetails::getStatus, 1)
|
|
|
.eq(filterPartnerInfoDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, filterPartnerInfoDto.getIndustrySector()));
|
|
|
BigDecimal sumPremium1 = sysPremiumDetail.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
BigDecimal extractFee1 = sysPremiumDetail.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
@@ -1543,7 +1591,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
.in(SysPremiumDetails::getUserId, leaderIds)
|
|
|
.between(StringUtils.isNotEmpty(partnerGradeInfo.getBeginTime()) && StringUtils.isNotEmpty(partnerGradeInfo.getEndTime()),
|
|
|
SysPremiumDetails::getCreateTime, partnerGradeInfo.getBeginTime(), partnerGradeInfo.getEndTime())
|
|
|
- .eq(SysPremiumDetails::getStatus,1)
|
|
|
+ .eq(SysPremiumDetails::getStatus, 1)
|
|
|
.eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector()));
|
|
|
BigDecimal sumPremium = sysPremiumDetails.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
BigDecimal extractFee = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
@@ -1569,7 +1617,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
.eq(SysPremiumDetails::getUserId, userId)
|
|
|
.between(StringUtils.isNotEmpty(partnerGradeInfo.getBeginTime()) && StringUtils.isNotEmpty(partnerGradeInfo.getEndTime()),
|
|
|
SysPremiumDetails::getCreateTime, partnerGradeInfo.getBeginTime(), partnerGradeInfo.getEndTime())
|
|
|
- .eq(SysPremiumDetails::getStatus,1)
|
|
|
+ .eq(SysPremiumDetails::getStatus, 1)
|
|
|
.eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector()));
|
|
|
BigDecimal sumPremium1 = sysPremiumDetail.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
BigDecimal extractFee1 = sysPremiumDetail.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|