angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 月度业绩查询没有数据月份报错处理；

This commit is contained in:
cabbage 2025-04-30 11:36:13 +08:00
parent cefc3e53f7
commit 1af2f21bdd
5 changed files with 42 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java
View File

@ -136,11 +136,6 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
**/ **/
List<PlaceNewAddAchieveVO> selectABNewMonthCoun(PlaceNewAddAchieveVO pna); List<PlaceNewAddAchieveVO> selectABNewMonthCoun(PlaceNewAddAchieveVO pna);
/**
* @description: 根据日期查询最新期数
**/
Integer mostNewPeriod(PlaceNewAddAchieveVO pna);
/** /**
* @description: 查询各个等级直推人数和业绩 * @description: 查询各个等级直推人数和业绩
**/ **/

12
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberAchieveService.java
View File

@ -20,9 +20,6 @@ import java.util.List;
/** /**
* 会员业绩记录 服务类 * 会员业绩记录 服务类
*
* @author hzs
* @since 2022-10-26
*/ */
public interface ICuMemberAchieveService extends IService<CuMemberAchieve> { public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
@ -65,15 +62,6 @@ public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
*/ */
CuMemberAwardsDisVO selectAwardsByPkMember(Long pkMember, Integer pkCountry); CuMemberAwardsDisVO selectAwardsByPkMember(Long pkMember, Integer pkCountry);
/**
* 查询个人的奖衔信息
*
* @param pkMember 用户ID
* @param pkCountry 国家ID
* @return CuMemberAwardsUnderVO
*/
CuMemberAwardsUnderVO selectMemberAwards(Long pkMember, Integer pkCountry);
/** /**
* 会员业绩进度（首页使用） * 会员业绩进度（首页使用）
* *

257
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java
View File

@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.core.constant.*; import com.hzs.common.core.constant.*;
import com.hzs.common.core.domain.R; import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.*; import com.hzs.common.core.enums.*;
import com.hzs.common.core.exception.ServiceException;
import com.hzs.common.core.utils.*; import com.hzs.common.core.utils.*;
import com.hzs.common.domain.member.achieve.CuMemberAchieve; import com.hzs.common.domain.member.achieve.CuMemberAchieve;
import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
@ -66,9 +65,6 @@ import java.util.stream.Collectors;
/** /**
* 会员业绩记录 服务实现类 * 会员业绩记录 服务实现类
*
* @author hzs
* @since 2022-10-26
*/ */
@Slf4j @Slf4j
@Service @Service
@ -198,25 +194,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
@Override @Override
public BigDecimal queryCuMemberUnderBloodAchieveByPkMember(MemberAchieveDisParam memberAchieveDisParam) { public BigDecimal queryCuMemberUnderBloodAchieveByPkMember(MemberAchieveDisParam memberAchieveDisParam) {
Date endDate = DateUtils.currentDate();
String endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endDate);
Date startDate;
// 近7天
CuMemberSettlePeriod cuMemberSettlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr);
if (EDayType.LAST_SEVEN_DAY.getValue() == memberAchieveDisParam.getDayType()) {
startDate = DateUtils.beforeDate(7, ChronoUnit.DAYS, endDate);
} else if (EDayType.LAST_FIFTEEN_DAY.getValue() == memberAchieveDisParam.getDayType()) {
startDate = DateUtils.beforeDate(15, ChronoUnit.DAYS, endDate);
} else {
startDate = DateUtils.beforeDate(1, ChronoUnit.MONTHS, endDate);
}
// 判断是否跨月
String treeTableName = TableNameConstants.CU_MEMBER_TREE + DateUtils.getMonth(endDateStr);
String achieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(endDateStr);
if (!DateUtils.betweenMonth(startDate, endDate)) {
}
return null; return null;
} }
@ -235,22 +212,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
} }
} }
/**
* 伞下安置人
*/
private void packageUnderMember(CuMemberAchieveDisVO leftMemberAchieveDisVO, CuMemberAchieveDisVO rightMemberAchieveDisVO,
Integer placeDept, String memberCode, String memberName) {
if (EPlaceDept.LEFT_DEPT.getValue() == placeDept) {
leftMemberAchieveDisVO.setPlaceDept(placeDept);
leftMemberAchieveDisVO.setUnderMemberCode(memberCode);
leftMemberAchieveDisVO.setUnderMemberName(memberName);
} else {
rightMemberAchieveDisVO.setPlaceDept(placeDept);
rightMemberAchieveDisVO.setUnderMemberCode(memberCode);
rightMemberAchieveDisVO.setUnderMemberName(memberCode);
}
}
@Override @Override
public List<CuMemberNewAddAchieveVO> selectNewAddAchieve(CuMemberNewAddAchieveVO cuMemberNewAddAchieveVO) { public List<CuMemberNewAddAchieveVO> selectNewAddAchieve(CuMemberNewAddAchieveVO cuMemberNewAddAchieveVO) {
LocalDate endDate = LocalDate.now(); LocalDate endDate = LocalDate.now();
@ -348,11 +309,9 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
//排序 //排序
cuMemberNewAddAchieveVOList.sort(Comparator.comparing(CuMemberNewAddAchieveVO::getSettleDate)); cuMemberNewAddAchieveVOList.sort(Comparator.comparing(CuMemberNewAddAchieveVO::getSettleDate));
} }
return cuMemberNewAddAchieveVOList; return cuMemberNewAddAchieveVOList;
} }
/** /**
* 根据天数类型获取开始日期 * 根据天数类型获取开始日期
* *
@ -375,60 +334,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
return startDate; return startDate;
} }
@Override
public CuMemberAwardsUnderVO selectMemberAwards(Long pkMember, Integer pkCountry) {
//根据实时小区业绩获取奖衔
CuMemberAwardsUnderVO cuMemberAwardsUnderVO = getPkAwardBySmallAchieve(pkMember, pkCountry, true);
//根据国家获取奖衔配置信息
List<BdAwards> awardsList = cuMemberAwardsUnderVO.getAwardsList();
//获取当前会员的奖衔
Integer pkAwards = cuMemberAwardsUnderVO.getPkAwards();
//升序排序
awardsList.sort(Comparator.comparing(BdAwards::getAwardsValue));
Map<Integer, BdAwards> awardsMap = awardsList.stream().collect(Collectors.toMap(BdAwards::getAwardsValue, o -> o));
if (pkAwards != null) {
BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(pkAwards).getData();
List<BdAwards> list = awardsList.stream().filter(a -> a.getAwardsValue() > bdAwards.getAwardsValue()).collect(Collectors.toList());
//当奖衔最大级别时，目标值-1
if (CollUtil.isNotEmpty(list)) {
BigDecimal targetPv = awardsMap.get(list.get(0).getAwardsValue()).getCommunityCheck();
cuMemberAwardsUnderVO.setTargetPv(targetPv.divide(new BigDecimal("10000")));
cuMemberAwardsUnderVO.setTarAwardsName(list.get(0).getAwardsName());
cuMemberAwardsUnderVO.setPkTransaction(list.get(0).getPkTransaction());
} else {
BigDecimal targetPv = new BigDecimal("-1");
cuMemberAwardsUnderVO.setTargetPv(targetPv);
}
//中国转汇率
if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
//根据国家查汇率
BigDecimal rate = iCuMemberBaseService.getCurrency(pkCountry).getInExchangeRate();
cuMemberAwardsUnderVO.setPkAwards(pkAwards);
cuMemberAwardsUnderVO.setAwardsName(bdAwards.getAwardsName());
cuMemberAwardsUnderVO.setSumRealPv(cuMemberAwardsUnderVO.getSumRealPv().divide(new BigDecimal("10000")));
cuMemberAwardsUnderVO.setTargetPv(getBigDecimal(cuMemberAwardsUnderVO.getTargetPv()).multiply(rate));
cuMemberAwardsUnderVO.setSumRealPv(getBigDecimal(cuMemberAwardsUnderVO.getSumRealPv()).multiply(rate));
//左区累计业绩
BigDecimal aSumPv = cuMemberAwardsUnderVO.getASumPv().divide(new BigDecimal("10000"));
cuMemberAwardsUnderVO.setASumPv(getBigDecimal(aSumPv).multiply(rate));
//右区累计业绩
BigDecimal bSumPv = cuMemberAwardsUnderVO.getBSumPv().divide(new BigDecimal("10000"));
cuMemberAwardsUnderVO.setBSumPv(getBigDecimal(bSumPv).multiply(rate));
//左区新增业绩
BigDecimal aNewPv = cuMemberAwardsUnderVO.getANewPv().divide(new BigDecimal("10000"));
cuMemberAwardsUnderVO.setANewPv(getBigDecimal(aNewPv).multiply(rate));
//右区新增业绩
BigDecimal bNewPv = cuMemberAwardsUnderVO.getBNewPv().divide(new BigDecimal("10000"));
cuMemberAwardsUnderVO.setBNewPv(getBigDecimal(bNewPv).multiply(rate));
}
}
return cuMemberAwardsUnderVO;
}
@Override @Override
public CuMemberAwardsUnderVO indexMemberAwards(Long pkMember, Integer pkCountry) { public CuMemberAwardsUnderVO indexMemberAwards(Long pkMember, Integer pkCountry) {
boolean hasSettle = false; boolean hasSettle = false;
@ -677,7 +582,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
cuMemberAwardsUnderVOList.add(cuMemberAwardsUnderVO); cuMemberAwardsUnderVOList.add(cuMemberAwardsUnderVO);
} }
return cuMemberAwardsUnderVOList; return cuMemberAwardsUnderVOList;
} }
/** /**
@ -745,23 +649,14 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
CuMemberMonthAchieveContrastVO lastMonthAchieve = getMonthInfo(lastMonthDate, pkMember, pkCountry); CuMemberMonthAchieveContrastVO lastMonthAchieve = getMonthInfo(lastMonthDate, pkMember, pkCountry);
lastMonthAchieve.setDate(lastMonthDate.format(DateTimeFormatter.ofPattern("yyyy-MM"))); lastMonthAchieve.setDate(lastMonthDate.format(DateTimeFormatter.ofPattern("yyyy-MM")));
//去年同月 （bug处理新需求不需要展示这部分数据）
// LocalDate lastYearDate = localDate.minus(12, ChronoUnit.MONTHS);
// CuMemberMonthAchieveContrastVO lastYearAchieve = getMonthInfo(lastYearDate, pkMember, pkCountry);
// lastYearAchieve.setDate(lastYearDate.format(DateTimeFormatter.ofPattern("yyyy-MM")));
//中国转汇率 //中国转汇率
if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
//根据国家查汇率 //根据国家查汇率
BigDecimal rate = iCuMemberBaseService.getCurrency(pkCountry).getInExchangeRate(); BigDecimal rate = iCuMemberBaseService.getCurrency(pkCountry).getInExchangeRate();
getAchieveContrastVOByRate(localMonthAchieve, rate); getAchieveContrastVOByRate(localMonthAchieve, rate);
getAchieveContrastVOByRate(lastMonthAchieve, rate); getAchieveContrastVOByRate(lastMonthAchieve, rate);
// getAchieveContrastVOByRate(lastYearAchieve, rate);
} }
// achieveContrastVOList.add(lastYearAchieve);
achieveContrastVOList.add(lastMonthAchieve); achieveContrastVOList.add(lastMonthAchieve);
achieveContrastVOList.add(localMonthAchieve); achieveContrastVOList.add(localMonthAchieve);
return achieveContrastVOList; return achieveContrastVOList;
@ -827,117 +722,67 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
*/ */
private String getAchieveTable(LocalDate localDate) { private String getAchieveTable(LocalDate localDate) {
String date = localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); String date = localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
String achieveTable = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(date); return TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(date);
return achieveTable;
} }
/** /**
* @description: 查询左右区新增业绩 * 查询左右区新增业绩
* @author: zhang jing
* @date: 2023/5/19 11:00
* @param: [pna]
* @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO
**/ **/
private PlaceNewAddAchieveVO selectNewABAchieve(PlaceNewAddAchieveVO pna) { private PlaceNewAddAchieveVO selectNewABAchieve(PlaceNewAddAchieveVO pna) {
return baseMapper.selectNewABAchieve(pna); return baseMapper.selectNewABAchieve(pna);
} }
/** /**
* @description: 查询左右区血缘业绩 * 查询左右区血缘业绩
* @author: zhang jing
* @date: 2023/9/25 11:30
* @param: [pna]
* @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO
**/ **/
private List<PlaceNewAddAchieveVO> selectABDirectAchieve(PlaceNewAddAchieveVO pna) { private List<PlaceNewAddAchieveVO> selectABDirectAchieve(PlaceNewAddAchieveVO pna) {
return baseMapper.selectABDirectAchieve(pna); return baseMapper.selectABDirectAchieve(pna);
} }
/** /**
* @description: 查询直推业绩 * 查询直推业绩
* @author: zhang jing
* @date: 2023/5/19 15:51
* @param: [pna]
* @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO
**/ **/
private PlaceNewAddAchieveVO selectParentAchieve(PlaceNewAddAchieveVO pna) { private PlaceNewAddAchieveVO selectParentAchieve(PlaceNewAddAchieveVO pna) {
return baseMapper.selectParentAchieve(pna); return baseMapper.selectParentAchieve(pna);
} }
/** /**
* @description: 查询历史左右区人数 * 查询历史左右区人数
* @author: zhang jing
* @date: 2023/5/19 11:32
* @param: [pna]
* @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO
**/ **/
private List<PlaceNewAddAchieveVO> selectABCoun(PlaceNewAddAchieveVO pna) { private List<PlaceNewAddAchieveVO> selectABCoun(PlaceNewAddAchieveVO pna) {
return baseMapper.selectABCoun(pna); return baseMapper.selectABCoun(pna);
} }
/** /**
* @description: 查询最新月份左右区人数 * 查询最新月份左右区人数
* @author: zhang jing
* @date: 2023/9/10 17:27
* @param: [pna]
* @return: java.lang.Integer
**/ **/
private List<PlaceNewAddAchieveVO> selectABNewMonthCoun(PlaceNewAddAchieveVO pna) { private List<PlaceNewAddAchieveVO> selectABNewMonthCoun(PlaceNewAddAchieveVO pna) {
return baseMapper.selectABNewMonthCoun(pna); return baseMapper.selectABNewMonthCoun(pna);
} }
/** /**
* @description: 根据日期查询最新期数 * 查询各个等级直推人数和业绩
* @author: zhang jing
* @date: 2023/6/6 14:52
* @param: [pna]
* @return: java.lang.Integer
**/
private Integer mostNewPeriod(PlaceNewAddAchieveVO pna) {
return baseMapper.mostNewPeriod(pna);
}
/**
* @description: 查询各个等级直推人数和业绩
* @author: zhang jing
* @date: 2023/5/23 10:20
* @param: [pav]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.ParentAchieveVO>
**/ **/
private List<ParentAchieveVO> selectParentCounAchieve(ParentAchieveVO pav) { private List<ParentAchieveVO> selectParentCounAchieve(ParentAchieveVO pav) {
return baseMapper.selectParentCounAchieve(pav); return baseMapper.selectParentCounAchieve(pav);
} }
/** /**
* @description: 查询本人直推业绩 * 查询本人直推业绩
* @author: zhang jing
* @date: 2023/5/23 19:32
* @param: [pav]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.ParentAchieveVO>
**/ **/
List<ParentAchieveVO> selfParentCounAchieve(ParentAchieveVO pav) { List<ParentAchieveVO> selfParentCounAchieve(ParentAchieveVO pav) {
return baseMapper.selfParentCounAchieve(pav); return baseMapper.selfParentCounAchieve(pav);
} }
/** /**
* @description: 查询前10直推业绩 * 查询前10直推业绩
* @author: zhang jing
* @date: 2023/5/23 19:32
* @param: [pav]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.ParentAchieveVO>
**/ **/
List<ParentAchieveVO> parentCounAchieveTop(ParentAchieveVO pav) { List<ParentAchieveVO> parentCounAchieveTop(ParentAchieveVO pav) {
return baseMapper.parentCounAchieveTop(pav); return baseMapper.parentCounAchieveTop(pav);
} }
/** /**
* @description: 直推业绩前十人伞下等级业绩 * 直推业绩前十人伞下等级业绩
* @author: zhang jing
* @date: 2023/5/31 19:57
* @param: [pav]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.ParentAchieveVO>
**/ **/
List<ParentAchieveVO> umbrellaAchieveTop(ParentAchieveVO pav) { List<ParentAchieveVO> umbrellaAchieveTop(ParentAchieveVO pav) {
return baseMapper.umbrellaAchieveTop(pav); return baseMapper.umbrellaAchieveTop(pav);
@ -945,7 +790,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
/** /**
* @description: 业绩分布-新增业绩统计 * 业绩分布-新增业绩统计
**/ **/
@Override @Override
public PlaceNewAddAchieveVO placeNewAddAchieveStat(PlaceNewAddAchieveVO pna) { public PlaceNewAddAchieveVO placeNewAddAchieveStat(PlaceNewAddAchieveVO pna) {
@ -991,17 +836,20 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
rtupna.setDirectAchieve(BigDecimal.ZERO); rtupna.setDirectAchieve(BigDecimal.ZERO);
return rtupna; return rtupna;
} }
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
BigDecimal leftAchieve = BigDecimal.ZERO;
BigDecimal rightAchieve = BigDecimal.ZERO;
String achieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(startDateStr); String achieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(startDateStr);
Integer number = iCuMemberTreeService.queryExistOracleTable(achieveTableName);
if (null != number && number != 0) {
// 月度业绩表存在
pna.setStartDate(startDateStr); pna.setStartDate(startDateStr);
pna.setEndDate(endDateStr); pna.setEndDate(endDateStr);
pna.setAchieveTableName(achieveTableName); pna.setAchieveTableName(achieveTableName);
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
//查询左右区业绩 //查询左右区业绩
PlaceNewAddAchieveVO achieve = selectNewABAchieve(pna); PlaceNewAddAchieveVO achieve = selectNewABAchieve(pna);
BigDecimal leftAchieve;
BigDecimal rightAchieve;
if (null != achieve) { if (null != achieve) {
if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
@ -1011,9 +859,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
leftAchieve = achieve.getLeftAchieve(); leftAchieve = achieve.getLeftAchieve();
rightAchieve = achieve.getRightAchieve(); rightAchieve = achieve.getRightAchieve();
} }
} else { }
leftAchieve = BigDecimal.ZERO;
rightAchieve = BigDecimal.ZERO;
} }
if (leftAchieve.compareTo(BigDecimal.ZERO) > 0) { if (leftAchieve.compareTo(BigDecimal.ZERO) > 0) {
@ -1173,11 +1019,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
} }
/** /**
* @description: 根据年月获取日期 * 根据年月获取日期
* @author: zhang jing
* @date: 2024/1/3 10:30
* @param: [year, month]
* @return: java.util.Date
**/ **/
@Override @Override
public Date getDateFromYearAndMonth(String year, String month) { public Date getDateFromYearAndMonth(String year, String month) {
@ -1202,11 +1044,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
} }
/** /**
* @description: 月度业绩-左右区人数详情(最新) * 月度业绩-左右区人数详情(最新)
* @author: zhang jing
* @date: 2023/9/28 11:38
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
**/ **/
@Override @Override
public List<PlaceNewAddAchieveVO> placeNewAddAchieveDetails(PlaceNewAddAchieveVO pna) { public List<PlaceNewAddAchieveVO> placeNewAddAchieveDetails(PlaceNewAddAchieveVO pna) {
@ -1214,11 +1052,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
} }
/** /**
* @description: 月度业绩-左右区人数详情(历史) * 月度业绩-左右区人数详情(历史)
* @author: zhang jing
* @date: 2023/11/29 11:38
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
**/ **/
@Override @Override
public List<PlaceNewAddAchieveVO> placeNewAddAchieveHistoryDetails(PlaceNewAddAchieveVO pna) { public List<PlaceNewAddAchieveVO> placeNewAddAchieveHistoryDetails(PlaceNewAddAchieveVO pna) {
@ -1226,11 +1060,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
} }
/** /**
* @description: 月度业绩-左右区业绩详情 * 月度业绩-左右区业绩详情
* @author: zhang jing
* @date: 2023/11/30 9:18
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
**/ **/
@Override @Override
public List<PlaceNewAddAchieveVO> leftRightAchieveDetails(PlaceNewAddAchieveVO pna) { public List<PlaceNewAddAchieveVO> leftRightAchieveDetails(PlaceNewAddAchieveVO pna) {
@ -1238,11 +1068,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
} }
/** /**
* @description: 月度业绩-左右区血缘业绩详情 * 月度业绩-左右区血缘业绩详情
* @author: zhang jing
* @date: 2023/11/30 11:25
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
**/ **/
@Override @Override
public List<PlaceNewAddAchieveVO> leftRightDirectAchieveDetails(PlaceNewAddAchieveVO pna) { public List<PlaceNewAddAchieveVO> leftRightDirectAchieveDetails(PlaceNewAddAchieveVO pna) {
@ -1250,11 +1076,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
} }
/** /**
* @description: 月度业绩-查询血缘业绩详情 * 月度业绩-查询血缘业绩详情
* @author: zhang jing
* @date: 2023/11/30 14:15
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
**/ **/
@Override @Override
public List<PlaceNewAddAchieveVO> directAchieveDetails(PlaceNewAddAchieveVO pna) { public List<PlaceNewAddAchieveVO> directAchieveDetails(PlaceNewAddAchieveVO pna) {
@ -1263,11 +1085,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
/** /**
* @description: 业绩分布-直推业绩（右图） * 业绩分布-直推业绩（右图）
* @author: zhang jing
* @date: 2023/5/20 16:20
* @param: [pa]
* @return: com.hzs.member.achieve.controller.vo.ParentAchieveVO
**/ **/
@Override @Override
public ParentAchieveVO parentAchieveRight(ParentAchieveVO pa) { public ParentAchieveVO parentAchieveRight(ParentAchieveVO pa) {
@ -1291,11 +1109,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
} }
/** /**
* @description: 判断是否跨月查询并获取表名 * 判断是否跨月查询并获取表名
* @author: zhang jing
* @date: 2023/5/23 19:38
* @param: [pa]
* @return: com.hzs.member.achieve.controller.vo.ParentAchieveVO
**/ **/
private ParentAchieveVO getDateStr(ParentAchieveVO pa) { private ParentAchieveVO getDateStr(ParentAchieveVO pa) {
String achieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(pa.getEndDate()); String achieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(pa.getEndDate());
@ -1308,11 +1122,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
} }
/** /**
* @description: 业绩分布-直推业绩统计（左图） * 业绩分布-直推业绩统计（左图）
* @author: zhang jing
* @date: 2023/5/23 14:22
* @param: [pa]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.ParentAchieveVO>
**/ **/
@Override @Override
public List<ParentAchieveVO> parentAchieveLeft(ParentAchieveVO pa) { public List<ParentAchieveVO> parentAchieveLeft(ParentAchieveVO pa) {
@ -1359,11 +1169,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
/** /**
* @description: 获取前十人员 * 获取前十人员
* @author: zhang jing
* @date: 2023/6/28 16:43
* @param: [pa, list]
* @return: com.hzs.member.achieve.controller.vo.ParentAchieveVO
**/ **/
private ParentAchieveVO getTopMember(ParentAchieveVO pa, List<ParentAchieveVO> list) { private ParentAchieveVO getTopMember(ParentAchieveVO pa, List<ParentAchieveVO> list) {
if (CollectionUtil.isNotEmpty(list)) { if (CollectionUtil.isNotEmpty(list)) {
@ -1405,7 +1211,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
return pa; return pa;
} }
@Override @Override
public List<PlacementDataVO> selectPlacementDataList(PlacementDataParam param) { public List<PlacementDataVO> selectPlacementDataList(PlacementDataParam param) {
String startDate = param.getStartDate(); String startDate = param.getStartDate();
@ -1433,10 +1238,8 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
} }
} }
return placementDataVOList; return placementDataVOList;
} }
/** /**
* 查询安置数据 * 查询安置数据
* *
@ -1578,7 +1381,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
return new ArrayList<>(); return new ArrayList<>();
} }
BigDecimal ten = new BigDecimal(10000); BigDecimal ten = new BigDecimal("10000");
/** /**
* 查询会员真实业绩 * 查询会员真实业绩

15
bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml
View File

@ -739,21 +739,6 @@
CONNECT BY pk_place_parent = PRIOR pk_id CONNECT BY pk_place_parent = PRIOR pk_id
</select> </select>
<!--根据日期查询最新期数-->
<select id="mostNewPeriod" parameterType="com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO"
resultType="java.lang.Integer">
select max(PK_ID)
from (
select s.PK_ID
from cu_member_settle_period s
INNER JOIN ${achieveTableName} t on t.period = s.PK_ID
where s.del_flag = 0
and s.settle_date >= to_date(#{startDate}, 'yyyy-mm-dd')
and s.settle_date &lt; to_date(#{endDate}, 'yyyy-mm-dd')
)
</select>
<!--查询直推业绩--> <!--查询直推业绩-->
<select id="selectParentAchieve" parameterType="com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO" <select id="selectParentAchieve" parameterType="com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO"
resultType="com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO"> resultType="com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO">

2
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TableNameConstants.java
View File

@ -2,8 +2,6 @@ package com.hzs.common.core.constant;
/** /**
* @Description: 表名 * @Description: 表名
* @Author: sui q
* @Time: 2022/11/2 13:35
* @Classname: TableNameConstants * @Classname: TableNameConstants
* @PackageName: com.hzs.common.core.constant * @PackageName: com.hzs.common.core.constant
*/ */