From 61b9b64a416b9171af5d7fd45c6684ce8ccda731 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 17:09:19 +0800
Subject: [PATCH] refactor(vip): 重构会员积分计算和流动逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiSaleServiceImpl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiSaleServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiSaleServiceImpl.java
index 950070e..024498c 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiSaleServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiSaleServiceImpl.java
@@ -62,18 +62,17 @@
new LambdaQueryWrapper<MallAchieveRecord>()
.eq(MallAchieveRecord::getMemberId, id)
);
- if (CollUtil.isNotEmpty(mallAchieveRecords)) {
- apiSaleInfoVo.setTotalSaleAmount(
- CollUtil.isNotEmpty(mallAchieveRecords)
- ? mallAchieveRecords.stream().map(MallAchieveRecord::getCostAmount).reduce(BigDecimal.ZERO, BigDecimal::add)
- : BigDecimal.ZERO);
- apiSaleInfoVo.setOrderCnt(CollUtil.isNotEmpty(mallAchieveRecords) ? mallAchieveRecords.size() : 0);
- }
+ apiSaleInfoVo.setTotalSaleAmount(
+ CollUtil.isNotEmpty(mallAchieveRecords)
+ ? mallAchieveRecords.stream().map(MallAchieveRecord::getCostAmount).reduce(BigDecimal.ZERO, BigDecimal::add)
+ : BigDecimal.ZERO);
+ apiSaleInfoVo.setOrderCnt(CollUtil.isNotEmpty(mallAchieveRecords) ? mallAchieveRecords.size() : 0);
- List<MallMember> mallMembers = this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId());
+ List<MallMember> mallMembers = this.baseMapper.selectByRefererId(mallMember.getInviteId());
apiSaleInfoVo.setTotalCnt(CollUtil.isNotEmpty(mallMembers) ? mallMembers.size() : 0);
- // todo 提现部分暂无
+ MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(id);
+ apiSaleInfoVo.setAvaAmount(mallMemberWallet.getCommission());
return new FebsResponse().success().data(apiSaleInfoVo);
}
@@ -161,7 +160,7 @@
apiLevelListInfoVo.setMemberCode(mallMember.getStoreMaster());
apiLevelListInfoVo.setCode(happySaleLevel.getCode());
apiLevelListInfoVo.setContent(happySaleLevel.getContent());
- apiLevelListInfoVo.setIconPng(happySaleLevel.getIconPng());
+ apiLevelListInfoVo.setHeaderPng(happySaleLevel.getIconPng());
apiLevelListInfoVos.add(apiLevelListInfoVo);
});
}
--
Gitblit v1.9.1