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

## 日业绩统计添加复购新増业绩处理；

This commit is contained in:
cabbage 2025-09-15 14:34:05 +08:00
parent 02533a9874
commit 849504ce62
2 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java
View File

@ -199,10 +199,10 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
if (settleExt == null) { if (settleExt == null) {
return cuMemberBonusExpandList; return cuMemberBonusExpandList;
} }
// settleExt.setRepurchaseAmount(ComputeUtil.computeAdd(settleExt.getRepurchaseAmount(), convertLocalCurrency(saOrderExt, bonusConfigDTO))); settleExt.setRepurchaseAmount(ComputeUtil.computeAdd(settleExt.getRepurchaseAmount(), saOrderExt.getOrderAmount()));
// settleExt.setRepurchasePv(ComputeUtil.computeAdd(settleExt.getRepurchasePv(), saOrderExt.getOrderAchieve())); settleExt.setRepurchasePv(ComputeUtil.computeAdd(settleExt.getRepurchasePv(), saOrderExt.getOrderAchieve()));
// settleExt.setRepurchaseNewAmount(ComputeUtil.computeAdd(settleExt.getRepurchaseNewAmount(), convertLocalCurrency(saOrderExt, bonusConfigDTO))); settleExt.setRepurchaseNewAmount(ComputeUtil.computeAdd(settleExt.getRepurchaseNewAmount(), saOrderExt.getOrderAmount()));
// settleExt.setRepurchaseNewPv(ComputeUtil.computeAdd(settleExt.getRepurchaseNewPv(), saOrderExt.getOrderAchieve())); settleExt.setRepurchaseNewPv(ComputeUtil.computeAdd(settleExt.getRepurchaseNewPv(), saOrderExt.getOrderAchieve()));
// 先计算新增，根据新增计算碰次 // 先计算新增，根据新增计算碰次
// 先进行初始化所有的安置人，存储需要修改的值,cuMemberSettleExtMap最终修改的 // 先进行初始化所有的安置人，存储需要修改的值,cuMemberSettleExtMap最终修改的

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

@ -765,8 +765,6 @@ 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 leftAchieve = BigDecimal.ZERO;
BigDecimal rightAchieve = BigDecimal.ZERO; BigDecimal rightAchieve = BigDecimal.ZERO;
@ -781,13 +779,8 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
PlaceNewAddAchieveVO achieve = selectNewABAchieve(pna); PlaceNewAddAchieveVO achieve = selectNewABAchieve(pna);
if (null != achieve) { if (null != achieve) {
if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { leftAchieve = achieve.getLeftAchieve();
leftAchieve = achieve.getLeftAchieve().multiply(currency.getData().getInExchangeRate()); rightAchieve = achieve.getRightAchieve();
rightAchieve = achieve.getRightAchieve().multiply(currency.getData().getInExchangeRate());
} else {
leftAchieve = achieve.getLeftAchieve();
rightAchieve = achieve.getRightAchieve();
}
} }
} }
@ -915,9 +908,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
PlaceNewAddAchieveVO endParentAchieve = selectParentAchieve(pam); PlaceNewAddAchieveVO endParentAchieve = selectParentAchieve(pam);
if (StringUtils.isNotNull(endParentAchieve)) { if (StringUtils.isNotNull(endParentAchieve)) {
rtupna.setDirectAchieve(endParentAchieve.getDirectAchieve()); rtupna.setDirectAchieve(endParentAchieve.getDirectAchieve());
if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
rtupna.setDirectAchieve(rtupna.getDirectAchieve().multiply(currency.getData().getInExchangeRate()));
}
if (rtupna.getDirectAchieve().compareTo(BigDecimal.ZERO) > 0) { if (rtupna.getDirectAchieve().compareTo(BigDecimal.ZERO) > 0) {
rtupna.setDirectAchieve(rtupna.getDirectAchieve().divide(MagicNumberConstants.big10000, 4, RoundingMode.DOWN)); rtupna.setDirectAchieve(rtupna.getDirectAchieve().divide(MagicNumberConstants.big10000, 4, RoundingMode.DOWN));
} else { } else {
@ -932,15 +922,11 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
if (CollectionUtil.isNotEmpty(lrDirectAchieve)) { if (CollectionUtil.isNotEmpty(lrDirectAchieve)) {
for (PlaceNewAddAchieveVO pl : lrDirectAchieve) { for (PlaceNewAddAchieveVO pl : lrDirectAchieve) {
if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) { if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) {
if (pna.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { leftDirectAchieve = pl.getDirectAchieve();
leftDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate());
} else {
leftDirectAchieve = pl.getDirectAchieve();
}
leftDirectAchieve = leftDirectAchieve.divide(MagicNumberConstants.big10000, 4, RoundingMode.DOWN); leftDirectAchieve = leftDirectAchieve.divide(MagicNumberConstants.big10000, 4, RoundingMode.DOWN);
} }
if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.RIGHT_DEPT.getValue()) { if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.RIGHT_DEPT.getValue()) {
rightDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate()); rightDirectAchieve = pl.getDirectAchieve();
rightDirectAchieve = rightDirectAchieve.divide(MagicNumberConstants.big10000, 4, RoundingMode.DOWN); rightDirectAchieve = rightDirectAchieve.divide(MagicNumberConstants.big10000, 4, RoundingMode.DOWN);
} }
} }