## Opt - 移动端市场动态总业绩
This commit is contained in:
parent
674a35c0aa
commit
04205423f9
|
@ -348,7 +348,7 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
|
||||||
String memberSecondTable = getDayTableNameSpecial();
|
String memberSecondTable = getDayTableNameSpecial();
|
||||||
//查询直推会员
|
//查询直推会员
|
||||||
List<Long> pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType);
|
List<Long> pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType);
|
||||||
pkMemberList.add(userId);
|
// pkMemberList.add(userId);
|
||||||
CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder()
|
CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder()
|
||||||
.memberRetailTable(memberRetailTable)
|
.memberRetailTable(memberRetailTable)
|
||||||
.memberRetailSTable(memberSecondTable)
|
.memberRetailSTable(memberSecondTable)
|
||||||
|
|
|
@ -36,16 +36,19 @@ public class DataStatisticsUtil {
|
||||||
Long pkId = cuMember.getPkId();
|
Long pkId = cuMember.getPkId();
|
||||||
// 非激活直接返0
|
// 非激活直接返0
|
||||||
// 激活判断上一天的ENABLE_STATUS 0为正常 1为当天激活 不计算日结数据
|
// 激活判断上一天的ENABLE_STATUS 0为正常 1为当天激活 不计算日结数据
|
||||||
if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
|
// if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
|
||||||
return CuMemberRetailDataStatisticsResultVO.builder()
|
// return CuMemberRetailDataStatisticsResultVO.builder()
|
||||||
.totalPv(BigDecimal.ZERO)
|
// .totalPv(BigDecimal.ZERO)
|
||||||
.bigRangeTotalPv(BigDecimal.ZERO)
|
// .bigRangeTotalPv(BigDecimal.ZERO)
|
||||||
.smallRangeTotalPv(BigDecimal.ZERO)
|
// .smallRangeTotalPv(BigDecimal.ZERO)
|
||||||
.build();
|
// .build();
|
||||||
}
|
// }
|
||||||
calcDetailVOTotalField(detailVOList, pkId);
|
calcDetailVOTotalField(detailVOList, pkId);
|
||||||
// addVirtualBranch(detailVOList, pkId);
|
// addVirtualBranch(detailVOList, pkId);
|
||||||
CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId);
|
// CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId);
|
||||||
|
CuMemberRetailDataStatisticsDetailVO total = CuMemberRetailDataStatisticsDetailVO.builder()
|
||||||
|
.totalPv(detailVOList.stream().map(CuMemberRetailDataStatisticsDetailVO::getConsumePv).reduce(BigDecimal.ZERO, BigDecimal::add))
|
||||||
|
.build();
|
||||||
// if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
|
// if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
|
||||||
// // 昨日非激活 排除昨日日结表数据
|
// // 昨日非激活 排除昨日日结表数据
|
||||||
// excludeDailySettlementData(detailVOList);
|
// excludeDailySettlementData(detailVOList);
|
||||||
|
|
Loading…
Reference in New Issue