diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index a2b662c9..79df2c67 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -2603,7 +2603,16 @@ public class CuMemberServiceImpl extends ServiceImpl i // 特殊复购 BigDecimal specialRepurchaseAmount = BigDecimal.ZERO; BigDecimal specialRepurchaseAchieve = BigDecimal.ZERO; + // 秒杀金额 + BigDecimal mallAmount = BigDecimal.ZERO; + // 秒杀业绩 + BigDecimal mallAchieve = BigDecimal.ZERO; // 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) { // 复购 repurchaseAmount = memberMeritsSummaryMap.get(EOrderType.REPURCHASE_ORDER.getValue()).getAmount(); @@ -2621,13 +2630,13 @@ public class CuMemberServiceImpl extends ServiceImpl i } // 复购金额+海粉金额+海粉升级+直播订单+合作订单+特殊复购 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.setRepurchaseAmountDollar(computeUSDExchangeRate(amount, inExchangeRate)); censusSummaryVo.setRepurchaseAmountLocality(checkIsDecimalNull(amount)); 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.setRepurchasePvDollar(checkIsDecimalNull(repurchasePvSum));