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 13:38:07 +08:00
parent 1af2f21bdd
commit 93f175d4e5
3 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java
View File

@ -7,9 +7,6 @@ import java.util.List;
/** /**
* 会员结算期间 服务类 * 会员结算期间 服务类
*
* @author hzs
* @since 2022-10-26
*/ */
public interface ICuMemberSettlePeriodService extends IService<CuMemberSettlePeriod> { public interface ICuMemberSettlePeriodService extends IService<CuMemberSettlePeriod> {

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

@ -882,9 +882,12 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
pna.setStartDate(startDateStr); pna.setStartDate(startDateStr);
pna.setAchieveTableName(treeTableNameEnd); pna.setAchieveTableName(treeTableNameEnd);
int endperiod = 0;
//查询最新期数 //查询最新期数
int endperiod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( CuMemberSettlePeriod settlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(endDateStr));
DateUtils.parseDateToStr(endDateStr)).getPkId(); if (null != settlePeriod) {
endperiod = settlePeriod.getPkId();
}
//如果是当前月，则查询最新月份数据 查询左右区人数 //如果是当前月，则查询最新月份数据 查询左右区人数
String monthStr = DateUtils.getMonth(endDateStr); String monthStr = DateUtils.getMonth(endDateStr);
//查询当前月份的左右区人数 //查询当前月份的左右区人数
@ -962,6 +965,9 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
} }
} }
BigDecimal leftDirectAchieve = BigDecimal.ZERO;
BigDecimal rightDirectAchieve = BigDecimal.ZERO;
//查询直推业绩（血缘业绩 查询月度表） //查询直推业绩（血缘业绩 查询月度表）
PlaceNewAddAchieveVO pam = new PlaceNewAddAchieveVO(); PlaceNewAddAchieveVO pam = new PlaceNewAddAchieveVO();
//查询结束日期业绩表 //查询结束日期业绩表
@ -988,33 +994,32 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
} else { } else {
rtupna.setDirectAchieve(BigDecimal.ZERO); rtupna.setDirectAchieve(BigDecimal.ZERO);
} }
}
//查询左右区血缘业绩 //查询左右区血缘业绩
List<PlaceNewAddAchieveVO> lrDirectAchieve = selectABDirectAchieve(pam); List<PlaceNewAddAchieveVO> lrDirectAchieve = selectABDirectAchieve(pam);
BigDecimal leftDirectAchieve; if (CollectionUtil.isNotEmpty(lrDirectAchieve)) {
BigDecimal rightDirectAchieve; for (PlaceNewAddAchieveVO pl : lrDirectAchieve) {
if (CollectionUtil.isNotEmpty(lrDirectAchieve)) { if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) {
for (PlaceNewAddAchieveVO pl : lrDirectAchieve) { if (pna.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) { leftDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate());
if (pna.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { } else {
leftDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate()); leftDirectAchieve = pl.getDirectAchieve();
} else { }
leftDirectAchieve = pl.getDirectAchieve(); leftDirectAchieve = leftDirectAchieve.divide(constant, 4, RoundingMode.DOWN);
} }
leftDirectAchieve = leftDirectAchieve.divide(constant, 4, RoundingMode.DOWN); if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.RIGHT_DEPT.getValue()) {
rtupna.setLeftDirectAchieve(leftDirectAchieve); if (pna.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
} rightDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate());
if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.RIGHT_DEPT.getValue()) { } else {
if (pna.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { rightDirectAchieve = pl.getDirectAchieve();
rightDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate()); }
} else { rightDirectAchieve = rightDirectAchieve.divide(constant, 4, RoundingMode.DOWN);
rightDirectAchieve = pl.getDirectAchieve();
} }
rightDirectAchieve = rightDirectAchieve.divide(constant, 4, RoundingMode.DOWN);
rtupna.setRightDirectAchieve(rightDirectAchieve);
} }
} }
} }
rtupna.setLeftDirectAchieve(leftDirectAchieve);
rtupna.setRightDirectAchieve(rightDirectAchieve);
return rtupna; return rtupna;
} }

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

@ -27,9 +27,6 @@ import java.util.*;
/** /**
* 会员结算期间 服务实现类 * 会员结算期间 服务实现类
*
* @author hzs
* @since 2022-10-26
*/ */
@Service @Service
public class CuMemberSettlePeriodServiceImpl extends ServiceImpl<CuMemberSettlePeriodMapper, CuMemberSettlePeriod> implements ICuMemberSettlePeriodService { public class CuMemberSettlePeriodServiceImpl extends ServiceImpl<CuMemberSettlePeriodMapper, CuMemberSettlePeriod> implements ICuMemberSettlePeriodService {