From 3064a503bc6d0030c1f812d57c4ba2cb7a650fea Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 02 Sep 2022 14:27:45 +0800 Subject: [PATCH] 20220822 --- src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 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 6bd1809..21a4142 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 @@ -16,6 +16,8 @@ import cc.mrbird.febs.mall.service.IApiMallMemberWalletService; import cc.mrbird.febs.mall.service.IMallMoneyFlowService; import cc.mrbird.febs.mall.vo.*; +import cc.mrbird.febs.pay.model.MemberWithdrawalDto; +import cc.mrbird.febs.pay.service.IXcxPayService; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -141,6 +143,8 @@ return adminMoneyChargeListVos; } + private final IXcxPayService iXcxPayService; + @Override @Transactional public FebsResponse chargeAgree(Long id) { @@ -152,16 +156,26 @@ if(1 != mallMemberWithdraw.getStatus()){ return new FebsResponse().fail().message("当前状态不是提现中"); } - mallMemberWithdraw.setStatus(2); - mallMemberWithdrawMapper.updateById(mallMemberWithdraw); QueryWrapper<MallMoneyFlow> objectQueryWrapper = new QueryWrapper<>(); objectQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo()); objectQueryWrapper.eq("type",MoneyFlowTypeEnum.WITHDRAWAL.getValue()); MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(objectQueryWrapper); + Long memberId = mallMemberWithdraw.getMemberId(); + MallMember mallMember = mallMemberMapper.selectById(memberId); + MemberWithdrawalDto memberWithdrawalDto = new MemberWithdrawalDto(); + memberWithdrawalDto.setDesc("余额提现"); + memberWithdrawalDto.setOpenid(mallMember.getOpenId()); + memberWithdrawalDto.setTotalFee(mallMemberWithdraw.getAmount()); + memberWithdrawalDto.setOutTradeNo(mallMoneyFlow.getOrderNo()); + Boolean aBoolean = iXcxPayService.memberWithdrawal(memberWithdrawalDto); + if(!aBoolean){ + return new FebsResponse().fail().message("微信提现失败,请查看微信商户状态"); + } + mallMemberWithdraw.setStatus(2); + mallMemberWithdrawMapper.updateById(mallMemberWithdraw); mallMoneyFlow.setStatus(2); mallMoneyFlowMapper.updateById(mallMoneyFlow); - return new FebsResponse().success(); } -- Gitblit v1.9.1