From 66307cde98aa604ce0f0bab0586df326210588ae Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Aug 2023 16:04:42 +0800
Subject: [PATCH] jufu商城

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java |   78 ++++++++++++++++++++-------------------
 1 files changed, 40 insertions(+), 38 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 8204fd4..6f9217b 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
@@ -79,6 +79,7 @@
     private final MallScoreAchieveReleaseMapper mallScoreAchieveReleaseMapper;
     private final NBYHService nbyhService;
     private final MallMemberAuthMapper mallMemberAuthMapper;
+    private final MallMemberAlipayMapper mallMemberAlipayMapper;
 
     @Override
     public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
@@ -830,49 +831,50 @@
         }
 
         Long wtihdrawTypeId = mallMemberWithdraw.getWtihdrawTypeId();
-        MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(wtihdrawTypeId);
-        if(ObjectUtil.isEmpty(mallMemberBank)){
-            return new FebsResponse().fail().message("提现银行卡已删除");
+        MallMemberAlipay mallMemberAlipay = mallMemberAlipayMapper.selectById(wtihdrawTypeId);
+        if(ObjectUtil.isEmpty(mallMemberAlipay)){
+            return new FebsResponse().fail().message("提现方式已删除");
         }
         String agreeType = mallMemberWithdrawInfo.getAgreeType();
-        if("1".equals(agreeType)){
-            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();
-        }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);
+        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());
-            }
+        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();
+//        if("1".equals(agreeType)){
+//        }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());
+//            }
+//        }
 
     }
 

--
Gitblit v1.9.1