From 541d141cf8d306c1974e17427666e4f09e4b1457 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 21 Feb 2024 18:08:59 +0800
Subject: [PATCH] 抽奖

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java |   87 ++++---------------------------------------
 1 files changed, 9 insertions(+), 78 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 735457f..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
@@ -177,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
@@ -220,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();
     }
 
@@ -691,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