From 5b1a5025c72a80f58fe6bdbaf90eeaf487d71076 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 17 Apr 2023 16:35:08 +0800
Subject: [PATCH] 只针对一星会员做修改： 按购买业绩（不按权益积分）每天静态释0.6%~1.2%
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 68 ++++++++++++++++++++++++++++++++--
1 files changed, 64 insertions(+), 4 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 f6248e1..9dff1e7 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
@@ -55,6 +55,7 @@
private final MallMemberWalletMapper mallMemberWalletMapper;
private final MallMoneyFlowMapper mallMoneyFlowMapper;
+ private final IMallMoneyFlowService mallMemberService;
private final MallMemberPaymentMapper mallMemberPaymentMapper;
@@ -231,11 +232,58 @@
MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(objectQueryWrapper);
mallMoneyFlow.setStatus(3);
mallMoneyFlowMapper.updateById(mallMoneyFlow);
-
- //用户佣金增加对应的余额
- iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
+ if(AppContants.MEMBER_WITHDRAW_NORMAL.equals(mallMemberWithdraw.getRemark())){
+ //用户佣金增加对应的余额
+ iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
+ mallMemberService.addMoneyFlow(mallMemberWithdraw.getMemberId(),
+ mallMemberWithdraw.getAmount(),
+ MoneyFlowTypeEnum.WITHDRAWAL.getValue(),
+ mallMemberWithdraw.getWithdrawNo(),
+ null,
+ null,
+ mallMemberWithdraw.getMemberId(),
+ 2,
+ FlowTypeEnum.BALANCE.getValue(),
+ 1);
+ }
if(AppContants.MEMBER_WITHDRAW_VOUCHER.equals(mallMemberWithdraw.getRemark())){
- iApiMallMemberWalletService.add(mallMemberWithdraw.getAmountFee(),mallMemberWithdraw.getMemberId(),"voucher_cnt");
+ iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
+
+ mallMemberService.addMoneyFlow(mallMemberWithdraw.getMemberId(),
+ mallMemberWithdraw.getAmount(),
+ MoneyFlowTypeEnum.WITHDRAWAL.getValue(),
+ mallMemberWithdraw.getWithdrawNo(),
+ null,
+ null,
+ mallMemberWithdraw.getMemberId(),
+ 2,
+ FlowTypeEnum.BALANCE.getValue(),
+ 1);
+ iApiMallMemberWalletService.add(mallMemberWithdraw.getAmountFee(),mallMemberWithdraw.getMemberId(),"voucherFireCnt");
+
+ mallMemberService.addMoneyFlow(mallMemberWithdraw.getMemberId(),
+ mallMemberWithdraw.getAmountFee(),
+ MoneyFlowTypeEnum.WITHDRAWAL.getValue(),
+ mallMemberWithdraw.getWithdrawNo(),
+ null,
+ null,
+ mallMemberWithdraw.getMemberId(),
+ 2,
+ FlowTypeEnum.COMMISSION.getValue(),
+ 1);
+ }
+ if(AppContants.MEMBER_WITHDRAW_VOUCHER_AMOUNT.equals(mallMemberWithdraw.getRemark())){
+ iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"voucherAmount");
+ mallMemberService.addMoneyFlow(mallMemberWithdraw.getMemberId(),
+ mallMemberWithdraw.getAmount(),
+ MoneyFlowTypeEnum.WITHDRAWAL.getValue(),
+ mallMemberWithdraw.getWithdrawNo(),
+ null,
+ null,
+ mallMemberWithdraw.getMemberId(),
+ 2,
+ FlowTypeEnum.VOUCHER_AMOUNT.getValue(),
+ 1);
}
return new FebsResponse().success();
}
@@ -649,6 +697,7 @@
adminMallMemberPaymentVo.setBankNo(mallMemberBank.getBankNo());
adminMallMemberPaymentVo.setBankName(mallMemberBank.getName());
adminMallMemberPaymentVo.setDigitalNo(mallMemberBank.getDigitalNo());
+ adminMallMemberPaymentVo.setSubbranchName(mallMemberBank.getSubbranchName());
adminMallMemberPaymentVo.setBank(mallMemberBank.getBankName());
}
return adminMallMemberPaymentVo;
@@ -736,6 +785,17 @@
return mallMoneyFlowIPage;
}
+ @Override
+ public FebsResponse insideWithType(Long id, int i) {
+ MallMember mallMember = mallMemberMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallMember)) {
+ return new FebsResponse().fail().message("会员信息不存在");
+ }
+ mallMember.setInsideWith(i);
+ mallMemberMapper.updateById(mallMember);
+ return new FebsResponse().success();
+ }
+
private String refererIds(String parentId) {
boolean flag = false;
if (StrUtil.isBlank(parentId)) {
--
Gitblit v1.9.1