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

## bug373 双轨的业绩汇总 复购没有加秒杀的业绩

This commit is contained in:
zhangheng 2025-09-10 16:13:54 +08:00
parent d133aa0e5f
commit 69e092e5bc
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
View File

@ -2603,7 +2603,16 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
// 特殊复购 // 特殊复购
BigDecimal specialRepurchaseAmount = BigDecimal.ZERO; BigDecimal specialRepurchaseAmount = BigDecimal.ZERO;
BigDecimal specialRepurchaseAchieve = BigDecimal.ZERO; BigDecimal specialRepurchaseAchieve = BigDecimal.ZERO;
// 秒杀金额
BigDecimal mallAmount = BigDecimal.ZERO;
// 秒杀业绩
BigDecimal mallAchieve = BigDecimal.ZERO;
// 3 10, 7 , 27 ，12 ， 14，19 ，22 ，26 // 3 10, 7 , 27 ，12 ， 14，19 ，22 ，26
if (memberMeritsSummaryMap.get(EOrderType.MALL_ORDER.getValue()) != null) {
mallAmount = memberMeritsSummaryMap.get(EOrderType.MALL_ORDER.getValue()).getAmount();
mallAchieve = memberMeritsSummaryMap.get(EOrderType.MALL_ORDER.getValue()).getAchieve();
}
if (memberMeritsSummaryMap.get(EOrderType.REPURCHASE_ORDER.getValue()) != null) { if (memberMeritsSummaryMap.get(EOrderType.REPURCHASE_ORDER.getValue()) != null) {
// 复购 // 复购
repurchaseAmount = memberMeritsSummaryMap.get(EOrderType.REPURCHASE_ORDER.getValue()).getAmount(); repurchaseAmount = memberMeritsSummaryMap.get(EOrderType.REPURCHASE_ORDER.getValue()).getAmount();
@ -2621,13 +2630,13 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
} }
// 复购金额+海粉金额+海粉升级+直播订单+合作订单+特殊复购 // 复购金额+海粉金额+海粉升级+直播订单+合作订单+特殊复购
BigDecimal amount = repurchaseAmount.add(fansAmount).add(haiFunUpgradeAmount) BigDecimal amount = repurchaseAmount.add(fansAmount).add(haiFunUpgradeAmount)
.add(mallOrderAmount).add(cooperateAmount).add(specialRepurchaseAmount); .add(mallOrderAmount).add(cooperateAmount).add(specialRepurchaseAmount).add(mallAmount);
censusSummaryVo.setRepurchaseAmount(computeChinaExchangeRate(loginUserCountry, amount, inExchangeRate, chinaInExchangeRate)); censusSummaryVo.setRepurchaseAmount(computeChinaExchangeRate(loginUserCountry, amount, inExchangeRate, chinaInExchangeRate));
censusSummaryVo.setRepurchaseAmountDollar(computeUSDExchangeRate(amount, inExchangeRate)); censusSummaryVo.setRepurchaseAmountDollar(computeUSDExchangeRate(amount, inExchangeRate));
censusSummaryVo.setRepurchaseAmountLocality(checkIsDecimalNull(amount)); censusSummaryVo.setRepurchaseAmountLocality(checkIsDecimalNull(amount));
BigDecimal repurchasePvSum = repurchaseAchieve.add(fansAchieve).add(haiFunUpgradeAchieve) BigDecimal repurchasePvSum = repurchaseAchieve.add(fansAchieve).add(haiFunUpgradeAchieve)
.add(mallOrderAchieve).add(cooperateAchieve).add(specialRepurchaseAchieve); .add(mallOrderAchieve).add(cooperateAchieve).add(specialRepurchaseAchieve).add(mallAchieve);
censusSummaryVo.setRepurchasePv(computeUSDToRMBRate(repurchasePvSum, chinaInExchangeRate)); censusSummaryVo.setRepurchasePv(computeUSDToRMBRate(repurchasePvSum, chinaInExchangeRate));
censusSummaryVo.setRepurchasePvDollar(checkIsDecimalNull(repurchasePvSum)); censusSummaryVo.setRepurchasePvDollar(checkIsDecimalNull(repurchasePvSum));