diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java index 9fbb3232..0b723812 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java @@ -7,9 +7,6 @@ import java.util.List; /** * 会员结算期间 服务类 - * - * @author hzs - * @since 2022-10-26 */ public interface ICuMemberSettlePeriodService extends IService { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java index d0e87705..9ce784ae 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java @@ -882,9 +882,12 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl lrDirectAchieve = selectABDirectAchieve(pam); - BigDecimal leftDirectAchieve; - BigDecimal rightDirectAchieve; - if (CollectionUtil.isNotEmpty(lrDirectAchieve)) { - for (PlaceNewAddAchieveVO pl : lrDirectAchieve) { - if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) { - if (pna.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - leftDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate()); - } else { - leftDirectAchieve = pl.getDirectAchieve(); + + //查询左右区血缘业绩 + List lrDirectAchieve = selectABDirectAchieve(pam); + if (CollectionUtil.isNotEmpty(lrDirectAchieve)) { + for (PlaceNewAddAchieveVO pl : lrDirectAchieve) { + if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) { + if (pna.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { + leftDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate()); + } else { + leftDirectAchieve = pl.getDirectAchieve(); + } + leftDirectAchieve = leftDirectAchieve.divide(constant, 4, RoundingMode.DOWN); } - leftDirectAchieve = leftDirectAchieve.divide(constant, 4, RoundingMode.DOWN); - rtupna.setLeftDirectAchieve(leftDirectAchieve); - } - if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.RIGHT_DEPT.getValue()) { - if (pna.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - rightDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate()); - } else { - rightDirectAchieve = pl.getDirectAchieve(); + if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.RIGHT_DEPT.getValue()) { + if (pna.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { + rightDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate()); + } else { + rightDirectAchieve = pl.getDirectAchieve(); + } + rightDirectAchieve = rightDirectAchieve.divide(constant, 4, RoundingMode.DOWN); } - rightDirectAchieve = rightDirectAchieve.divide(constant, 4, RoundingMode.DOWN); - rtupna.setRightDirectAchieve(rightDirectAchieve); } } } + rtupna.setLeftDirectAchieve(leftDirectAchieve); + rtupna.setRightDirectAchieve(rightDirectAchieve); return rtupna; } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java index 9ef71ad8..a190370c 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java @@ -27,9 +27,6 @@ import java.util.*; /** * 会员结算期间 服务实现类 - * - * @author hzs - * @since 2022-10-26 */ @Service public class CuMemberSettlePeriodServiceImpl extends ServiceImpl implements ICuMemberSettlePeriodService {