From 75067731200e8bfbee363c283c10647805779e6e Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 12 Jun 2023 02:28:07 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index 181006d..58d2977 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -36,6 +36,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -233,8 +234,8 @@
mallMoneyFlowMapper.updateById(mallMoneyFlow);
if(AppContants.MEMBER_WITHDRAW_NORMAL.equals(mallMemberWithdraw.getRemark())){
//用户佣金增加对应的余额
- iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
- mallMoneyFlowService.addMoneyFlow(mallMemberWithdraw.getMemberId(), mallMemberWithdraw.getAmount(), MoneyFlowTypeEnum.WITHDRAWAL.getValue(),null, FlowTypeEnum.BALANCE.getValue());
+ iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount().add(mallMemberWithdraw.getAmountFee()),mallMemberWithdraw.getMemberId(),"balance");
+// mallMoneyFlowService.addMoneyFlow(mallMemberWithdraw.getMemberId(), mallMemberWithdraw.getAmount().add(mallMemberWithdraw.getAmountFee()), MoneyFlowTypeEnum.WITHDRAWAL.getValue(), mallMemberWithdraw.getWithdrawNo(), FlowTypeEnum.BALANCE.getValue());
}
return new FebsResponse().success();
}
@@ -771,4 +772,44 @@
return ids;
}
+
+ @Override
+ public List<MallMember> findParentMemberList(List<String> inviteIds, Integer level, boolean containsParent) {
+ List<MallMember> mallMembers = this.baseMapper.selectByInviteIds(inviteIds);
+ if(CollUtil.isEmpty(mallMembers)) {
+ return mallMembers;
+ }
+
+
+ List<MallMember> result = new ArrayList<>();
+ int index = containsParent ? 0 : 1;
+ int count = 0;
+ while(true) {
+ if (level != null && count == level) {
+ break;
+ }
+
+ if (index >= mallMembers.size()) {
+ break;
+ }
+
+ String inviteId = inviteIds.get(index);
+ List<MallMember> collect = mallMembers.stream().filter(item -> item.getInviteId().equals(inviteId)).collect(Collectors.toList());
+ result.add(collect.get(0));
+
+ index++;
+ count++;
+ }
+ return result;
+ }
+
+ @Override
+ public TreeItemVo findMatrixTree() {
+ return null;
+ }
+
+ @Override
+ public List<ChargeListExportVo> findChargeListForExcel(MoneyChargeListDto moneyChargeListDto) {
+ return this.mallMoneyFlowMapper.selectChargeListForExcel(moneyChargeListDto);
+ }
}
--
Gitblit v1.9.1