From ad3481f8ea26a928fbd113fa8c01a194d6d0ed3d Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 27 Feb 2024 16:01:59 +0800
Subject: [PATCH] 抽奖
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 94 +++++-----------------------------------------
1 files changed, 11 insertions(+), 83 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 1e1ee93..06969ba 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
@@ -2,10 +2,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
-import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
-import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.GreenScoreEnum;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.LoginUserUtil;
@@ -180,31 +177,9 @@
return new FebsResponse().fail().message("当前状态不是提现中");
}
- Long wtihdrawTypeId = mallMemberWithdraw.getWtihdrawTypeId();
- MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(wtihdrawTypeId);
- String bankName = mallMemberBank.getBankName();
- NBYHResponse nbyhResponse = new NBYHResponse();
- if("宁波银行".equals(bankName)){
- nbyhResponse = nbyhService.tradeSinge(mallMemberWithdraw.getId());
- }else{
- nbyhResponse = nbyhService.tradeSingeOuterTransfer(mallMemberWithdraw.getId());
- }
- if(nbyhResponse.isFlag()){
- mallMemberWithdraw.setStatus(2);
- mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
-
- QueryWrapper<MallMoneyFlow> flowQueryWrapper = new QueryWrapper<>();
- flowQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo());
- flowQueryWrapper.eq("type",MoneyFlowTypeEnum.WITHDRAWAL.getValue());
- MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(flowQueryWrapper);
- if(ObjectUtil.isNotEmpty(mallMoneyFlow)){
- mallMoneyFlow.setStatus(2);
- mallMoneyFlowMapper.updateById(mallMoneyFlow);
- }
- return new FebsResponse().success().message(nbyhResponse.getMsg());
- }else{
- return new FebsResponse().fail().message(nbyhResponse.getMsg());
- }
+ mallMemberWithdraw.setStatus(2);
+ mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
+ return new FebsResponse().success().message("操作成功");
}
@Override
@@ -223,63 +198,13 @@
QueryWrapper<MallMoneyFlow> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo());
- objectQueryWrapper.eq("type",MoneyFlowTypeEnum.WITHDRAWAL.getValue());
+ objectQueryWrapper.eq("type",MoneyFlowTypeNewEnum.RANK_BONUS.getValue());
MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(objectQueryWrapper);
mallMoneyFlow.setStatus(3);
mallMoneyFlowMapper.updateById(mallMoneyFlow);
- 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.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
+ //用户佣金增加对应的余额
+ 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();
}
@@ -476,7 +401,7 @@
} else {
iApiMallMemberWalletService.add(mallSystemPayDto.getAddBalance(), mallSystemPayDto.getId(), filedType);
}
- mallMoneyFlowService.addMoneyFlow(memberId, bigDecimal, MoneyFlowTypeEnum.SYSTEM.getValue(), null, type);
+ mallMoneyFlowService.addMoneyFlow(memberId, bigDecimal, MoneyFlowTypeNewEnum.AGENT_BONUS.getValue(), null, type);
return new FebsResponse().success();
}
@@ -694,6 +619,9 @@
adminMallMemberPaymentVo.setDigitalNo(mallMemberBank.getDigitalNo());
adminMallMemberPaymentVo.setSubbranchName(mallMemberBank.getSubbranchName());
adminMallMemberPaymentVo.setBank(mallMemberBank.getBankName());
+ adminMallMemberPaymentVo.setIdCardNum(mallMemberBank.getIdCardNum());
+ adminMallMemberPaymentVo.setPhone(mallMemberBank.getPhone());
+ adminMallMemberPaymentVo.setName(mallMemberBank.getName());
}
return adminMallMemberPaymentVo;
}
--
Gitblit v1.9.1