From e9c73e4187d6502963055a152dbd07f9b73221e9 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 13 Mar 2024 17:14:47 +0800
Subject: [PATCH] 抽奖
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 91 +++++++++++++++++++++++++--------------------
1 files changed, 51 insertions(+), 40 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 06969ba..13bcee4 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
@@ -12,6 +12,7 @@
import cc.mrbird.febs.mall.entity.MallNewsInfo;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
+import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.mall.vo.*;
@@ -56,6 +57,8 @@
private final MallMoneyFlowMapper mallMoneyFlowMapper;
private final IMallMoneyFlowService mallMemberService;
+ private final IApiMallMemberService iApiMallMemberService;
+ private final IApiMallMemberService apiMallMemberService;
private final MallMemberPaymentMapper mallMemberPaymentMapper;
@@ -200,10 +203,23 @@
objectQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo());
objectQueryWrapper.eq("type",MoneyFlowTypeNewEnum.RANK_BONUS.getValue());
MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(objectQueryWrapper);
- mallMoneyFlow.setStatus(3);
- mallMoneyFlowMapper.updateById(mallMoneyFlow);
- //用户佣金增加对应的余额
- iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
+ if(ObjectUtil.isNotEmpty(mallMoneyFlow)){
+ mallMoneyFlow.setStatus(3);
+ mallMoneyFlowMapper.updateById(mallMoneyFlow);
+ //用户佣金增加对应的余额
+ iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
+ }else{
+ iApiMallMemberService.addMoneyFlow(
+ mallMemberWithdraw.getMemberId(),
+ mallMemberWithdraw.getAmount(),
+ MoneyFlowTypeNewEnum.AGENT_BONUS.getValue(),
+ mallMemberWithdraw.getWithdrawNo(),
+ MoneyFlowTypeNewEnum.AGENT_BONUS.getDescription(),
+ null,
+ null,
+ 3,
+ FlowTypeEnum.BALANCE.getValue());
+ }
return new FebsResponse().success();
}
@@ -401,7 +417,17 @@
} else {
iApiMallMemberWalletService.add(mallSystemPayDto.getAddBalance(), mallSystemPayDto.getId(), filedType);
}
- mallMoneyFlowService.addMoneyFlow(memberId, bigDecimal, MoneyFlowTypeNewEnum.AGENT_BONUS.getValue(), null, type);
+ String orderNo = MallUtils.getOrderNum("C");
+ apiMallMemberService.addMoneyFlow(
+ memberId,
+ bigDecimal,
+ MoneyFlowTypeNewEnum.AGENT_BONUS.getValue(),
+ orderNo,
+ MoneyFlowTypeNewEnum.AGENT_BONUS.getDescription(),
+ null,
+ null,
+ 2,
+ FlowTypeEnum.BALANCE.getValue());
return new FebsResponse().success();
}
@@ -762,44 +788,29 @@
return new FebsResponse().fail().message("提现银行卡已删除");
}
String agreeType = mallMemberWithdrawInfo.getAgreeType();
- if("1".equals(agreeType)){
- mallMemberWithdraw.setStatus(2);
- mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
+ 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();
+ 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);
}else{
- 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());
- }
+ iApiMallMemberService.addMoneyFlow(
+ mallMemberWithdraw.getMemberId(),
+ mallMemberWithdraw.getAmount(),
+ MoneyFlowTypeNewEnum.AGENT_BONUS.getValue(),
+ mallMemberWithdraw.getWithdrawNo(),
+ MoneyFlowTypeNewEnum.AGENT_BONUS.getDescription(),
+ null,
+ null,
+ 2,
+ FlowTypeEnum.BALANCE.getValue());
}
+ return new FebsResponse().success();
}
--
Gitblit v1.9.1