From 69e092e5bc05b046ef5bbe3e46a8e0beef6648b3 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Wed, 10 Sep 2025 16:13:54 +0800 Subject: [PATCH] =?UTF-8?q?##=20bug373=20=E5=8F=8C=E8=BD=A8=E7=9A=84?= =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E6=B1=87=E6=80=BB=20=E5=A4=8D=E8=B4=AD?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8A=A0=E7=A7=92=E6=9D=80=E7=9A=84=E4=B8=9A?= =?UTF-8?q?=E7=BB=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/service/impl/CuMemberServiceImpl.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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));