From 14c21b60908e79d6edaaad46b82b94662bd00805 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Thu, 9 Oct 2025 10:25:32 +0800 Subject: [PATCH] =?UTF-8?q?##=20bug431=20=E4=B8=9A=E7=BB=A9=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E6=B1=87=E6=80=BB=E9=A1=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CuMemberServiceImpl.java | 46 ++++++++++-------- .../hzs/member/census/vo/CensusSummaryVo.java | 47 +++++-------------- 2 files changed, 37 insertions(+), 56 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 9fd7c590..8fca1f7c 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 @@ -3191,7 +3191,7 @@ public class CuMemberServiceImpl extends ServiceImpl i CensusSummaryVo censusSummaryVo = new CensusSummaryVo(); censusSummaryVo.setSettleDate(day); - // 注册 + // 精品 BigDecimal reAmount = BigDecimal.ZERO; BigDecimal reAchieve = BigDecimal.ZERO; if (memberMeritsSummaryMap.get(EOrderType.RETAIL_REGISTER.getValue()) != null) { @@ -3201,36 +3201,42 @@ public class CuMemberServiceImpl extends ServiceImpl i censusSummaryVo.setRegisterAmount(reAmount); censusSummaryVo.setRegisterPv(reAchieve); - // 升级 + // 甄选 BigDecimal upAmount = BigDecimal.ZERO; BigDecimal upAchieve = BigDecimal.ZERO; + if (memberMeritsSummaryMap.get(EOrderType.RETAIL_UPGRADE.getValue()) != null) { + upAmount = memberMeritsSummaryMap.get(EOrderType.RETAIL_UPGRADE.getValue()).getAmount(); + upAchieve = memberMeritsSummaryMap.get(EOrderType.RETAIL_UPGRADE.getValue()).getAchieve(); + } censusSummaryVo.setUpgradeAmount(upAmount); censusSummaryVo.setUpgradePv(upAchieve); - // 首购 - censusSummaryVo.setFirstPurchaseAmount(censusSummaryVo.getRegisterAmount().add(censusSummaryVo.getUpgradeAmount())); - censusSummaryVo.setFirstPurchasePv(censusSummaryVo.getRegisterPv().add(censusSummaryVo.getUpgradePv())); - - // 复购订单 - BigDecimal repurchaseAmount = BigDecimal.ZERO; - BigDecimal repurchaseAchieve = BigDecimal.ZERO; + // 商城 + BigDecimal repAmount = BigDecimal.ZERO; + BigDecimal repAchieve = BigDecimal.ZERO; if (memberMeritsSummaryMap.get(EOrderType.RETAIL_REPURCHASE.getValue()) != null) { - repurchaseAmount = memberMeritsSummaryMap.get(EOrderType.RETAIL_REPURCHASE.getValue()).getAmount(); - repurchaseAchieve = memberMeritsSummaryMap.get(EOrderType.RETAIL_REPURCHASE.getValue()).getAchieve(); - } - // 复消 - if (memberMeritsSummaryMap.get(EOrderType.CONSUME_ORDER.getValue()) != null) { - repurchaseAmount = repurchaseAmount.add(memberMeritsSummaryMap.get(EOrderType.RETAIL_CONSUME.getValue()).getAmount()); + repAmount = memberMeritsSummaryMap.get(EOrderType.RETAIL_REPURCHASE.getValue()).getAmount(); + repAchieve = memberMeritsSummaryMap.get(EOrderType.RETAIL_REPURCHASE.getValue()).getAchieve(); } + censusSummaryVo.setRepurchaseAmount(repAmount); + censusSummaryVo.setRepurchasePv(repAchieve); - // 复购 - censusSummaryVo.setRepurchaseAmount(repurchaseAmount); - censusSummaryVo.setRepurchasePv(repurchaseAchieve); + // 五折 + BigDecimal disAmount = BigDecimal.ZERO; + BigDecimal disAchieve = BigDecimal.ZERO; + if (memberMeritsSummaryMap.get(EOrderType.DISCOUNT_ORDER.getValue()) != null) { + disAmount = memberMeritsSummaryMap.get(EOrderType.DISCOUNT_ORDER.getValue()).getAmount(); + disAchieve = memberMeritsSummaryMap.get(EOrderType.DISCOUNT_ORDER.getValue()).getAchieve(); + } + censusSummaryVo.setDiscountAmount(disAmount); + censusSummaryVo.setDiscountPv(disAchieve); // 金额总计 - censusSummaryVo.setAmountTotal(censusSummaryVo.getFirstPurchaseAmount().add(censusSummaryVo.getRepurchaseAmount())); + censusSummaryVo.setAmountTotal(censusSummaryVo.getRegisterAmount().add(censusSummaryVo.getUpgradeAmount()) + .add(censusSummaryVo.getRepurchaseAmount()).add(censusSummaryVo.getDiscountAmount())); // 业绩汇总 - censusSummaryVo.setPvTotal(censusSummaryVo.getFirstPurchasePv().add(censusSummaryVo.getRepurchasePv())); + censusSummaryVo.setPvTotal(censusSummaryVo.getRegisterPv().add(censusSummaryVo.getUpgradePv()) + .add(censusSummaryVo.getRepurchasePv()).add(censusSummaryVo.getDiscountPv())); censusSummaryList.add(censusSummaryVo); } return censusSummaryList; diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/census/vo/CensusSummaryVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/census/vo/CensusSummaryVo.java index 91faac1a..b2ad770d 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/census/vo/CensusSummaryVo.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/census/vo/CensusSummaryVo.java @@ -19,54 +19,29 @@ public class CensusSummaryVo { @Excel(name = "结算时间") private String settleDate; - /** - * 注册金额 - */ - @Excel(name = "注册金额") + @Excel(name = "精品金额") private BigDecimal registerAmount; - /** - * 注册业绩 - */ - @Excel(name = "注册业绩") + @Excel(name = "精品业绩") private BigDecimal registerPv; - /** - * 升级金额 - */ - @Excel(name = "升级金额") + @Excel(name = "甄选金额") private BigDecimal upgradeAmount; - /** - * 升级业绩 - */ - @Excel(name = "升级业绩") + @Excel(name = "甄选业绩") private BigDecimal upgradePv; - /** - * 首购金额 - */ - @Excel(name = "首购金额") - private BigDecimal firstPurchaseAmount; - - /** - * 首购业绩 - */ - @Excel(name = "首购业绩") - private BigDecimal firstPurchasePv; - - /** - * 复购金额 - */ - @Excel(name = "复购金额") + @Excel(name = "商城金额") private BigDecimal repurchaseAmount; - /** - * 复购pv - */ - @Excel(name = "复购业绩") + @Excel(name = "商城业绩") private BigDecimal repurchasePv; + @Excel(name = "五折金额") + private BigDecimal discountAmount; + + @Excel(name = "五折业绩") + private BigDecimal discountPv; /** * 金额总计 */