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

## bug431 业绩汇总汇总页调整

This commit is contained in:
zhangheng 2025-10-09 10:25:32 +08:00
parent 969e8e2958
commit 14c21b6090
2 changed files with 37 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3191,7 +3191,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> 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<CuMemberMapper, CuMember> 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;

47
bd-business/bd-business-member/src/main/java/com/hzs/member/census/vo/CensusSummaryVo.java
View File

@ -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;
/**
* 金额总计
*/