From 6699343f1f9ad8ab2aaff677c99ef36ae009f0e9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 30 Sep 2022 14:29:20 +0800
Subject: [PATCH] 20220902

---
 src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html    |  106 +++++++++++++++++-----------------
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java     |    3 
 src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java         |    2 
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java |   14 ++++
 4 files changed, 71 insertions(+), 54 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
index 60e077e..e62484f 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -128,7 +128,8 @@
     @GetMapping("paymentInfo/{id}")
     @RequiresPermissions("paymentInfo:update")
     public String paymentInfo(@PathVariable long id, Model model) {
-        AdminMallMemberPaymentVo data = mallMemberService.getMallMemberPaymentInfoByFlowId(id);
+//        AdminMallMemberPaymentVo data = mallMemberService.getMallMemberPaymentInfoByFlowId(id);
+        AdminMallMemberPaymentVo data = mallMemberService.getMallBankInfoById(id);
         model.addAttribute("paymentInfo", data);
         return FebsUtil.view("modules/mallMember/paymentInfo");
     }
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
index 431d26b..09fc113 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
@@ -95,4 +95,6 @@
     void modifyReferer(MallMember member);
 
     void updateShopApply(MallShopApply apply);
+
+    AdminMallMemberPaymentVo getMallBankInfoById(long id);
 }
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 8b42b2a..b9e686b 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
@@ -605,6 +605,20 @@
         mallShopApplyMapper.updateById(mallShopApply);
     }
 
+    @Override
+    public AdminMallMemberPaymentVo getMallBankInfoById(long id) {
+
+        MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectById(id);
+        Long wtihdrawTypeId = mallMemberWithdraw.getWtihdrawTypeId();
+        MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(wtihdrawTypeId);
+        AdminMallMemberPaymentVo adminMallMemberPaymentVo = new AdminMallMemberPaymentVo();
+        if(ObjectUtil.isNotEmpty(mallMemberBank)){
+            adminMallMemberPaymentVo.setBankNo(mallMemberBank.getBankNo());
+            adminMallMemberPaymentVo.setBankName(mallMemberBank.getName());
+        }
+        return adminMallMemberPaymentVo;
+    }
+
     private String refererIds(String parentId) {
         boolean flag = false;
         if (StrUtil.isBlank(parentId)) {
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html b/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html
index 3180f1c..e10c152 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html
@@ -19,46 +19,46 @@
 </style>
 <div class="layui-fluid" id="user-payment-info">
     <form class="layui-form" action="" lay-filter="user-payment-info-form">
-        <div class="layui-row layui-col-space10 layui-form-item">
-            <div class="layui-col-lg6">
-                <label class="layui-form-label">微信姓名:</label>
-                <div class="layui-input-block">
-                    <input type="text" name="wxName" class="layui-input" readonly>
-                </div>
-            </div>
-            <div class="layui-col-lg6">
-                <label class="layui-form-label">微信账号:</label>
-                <div class="layui-input-block">
-                    <input type="text" name="wxAccount" class="layui-input" readonly>
-                </div>
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">微信收款码:</label>
-            <div class="layui-input-block">
-                <img alt="微信收款码" data-th-src="${paymentInfo.wxQrcode}"  style="width: 200px">
-            </div>
-        </div>
-        <div class="layui-row layui-col-space10 layui-form-item">
-            <div class="layui-col-lg6">
-                <label class="layui-form-label">支付宝姓名:</label>
-                <div class="layui-input-block">
-                    <input type="text" name="aliName" class="layui-input" readonly>
-                </div>
-            </div>
-            <div class="layui-col-lg6">
-                <label class="layui-form-label">支付宝账号:</label>
-                <div class="layui-input-block">
-                    <input type="text" name="aliAccount" class="layui-input" readonly>
-                </div>
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">支付宝收款码:</label>
-            <div class="layui-input-block">
-                <img alt="支付宝收款码" data-th-src="${paymentInfo.aliQrcode}"  style="width: 200px">
-            </div>
-        </div>
+<!--        <div class="layui-row layui-col-space10 layui-form-item">-->
+<!--            <div class="layui-col-lg6">-->
+<!--                <label class="layui-form-label">微信姓名:</label>-->
+<!--                <div class="layui-input-block">-->
+<!--                    <input type="text" name="wxName" class="layui-input" readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="layui-col-lg6">-->
+<!--                <label class="layui-form-label">微信账号:</label>-->
+<!--                <div class="layui-input-block">-->
+<!--                    <input type="text" name="wxAccount" class="layui-input" readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="layui-form-item">-->
+<!--            <label class="layui-form-label">微信收款码:</label>-->
+<!--            <div class="layui-input-block">-->
+<!--                <img alt="微信收款码" data-th-src="${paymentInfo.wxQrcode}"  style="width: 200px">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="layui-row layui-col-space10 layui-form-item">-->
+<!--            <div class="layui-col-lg6">-->
+<!--                <label class="layui-form-label">支付宝姓名:</label>-->
+<!--                <div class="layui-input-block">-->
+<!--                    <input type="text" name="aliName" class="layui-input" readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="layui-col-lg6">-->
+<!--                <label class="layui-form-label">支付宝账号:</label>-->
+<!--                <div class="layui-input-block">-->
+<!--                    <input type="text" name="aliAccount" class="layui-input" readonly>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="layui-form-item">-->
+<!--            <label class="layui-form-label">支付宝收款码:</label>-->
+<!--            <div class="layui-input-block">-->
+<!--                <img alt="支付宝收款码" data-th-src="${paymentInfo.aliQrcode}"  style="width: 200px">-->
+<!--            </div>-->
+<!--        </div>-->
         <div class="layui-row layui-col-space10 layui-form-item">
             <div class="layui-col-lg6">
                 <label class="layui-form-label">持卡人姓名:</label>
@@ -66,12 +66,12 @@
                     <input type="text" name="bankName" class="layui-input" readonly>
                 </div>
             </div>
-            <div class="layui-col-lg6">
-                <label class="layui-form-label">开户行:</label>
-                <div class="layui-input-block">
-                    <input type="text" name="bank" class="layui-input" readonly>
-                </div>
-            </div>
+<!--            <div class="layui-col-lg6">-->
+<!--                <label class="layui-form-label">开户行:</label>-->
+<!--                <div class="layui-input-block">-->
+<!--                    <input type="text" name="bank" class="layui-input" readonly>-->
+<!--                </div>-->
+<!--            </div>-->
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">银行卡号:</label>
@@ -102,15 +102,15 @@
 
         function initUserValue() {
             form.val("user-payment-info-form", {
-                "wxName": paymentInfo.wxName,
-                "wxAccount": paymentInfo.wxAccount,
-                "wxQrcode": paymentInfo.wxQrcode,
-                "aliName": paymentInfo.aliName,
-                "aliAccount": paymentInfo.aliAccount,
-                "aliQrcode": paymentInfo.aliQrcode,
+                // "wxName": paymentInfo.wxName,
+                // "wxAccount": paymentInfo.wxAccount,
+                // "wxQrcode": paymentInfo.wxQrcode,
+                // "aliName": paymentInfo.aliName,
+                // "aliAccount": paymentInfo.aliAccount,
+                // "aliQrcode": paymentInfo.aliQrcode,
                 "bankName": paymentInfo.bankName,
                 "bankNo": paymentInfo.bankNo,
-                "bank": paymentInfo.bank
+                // "bank": paymentInfo.bank
             });
         }
     });

--
Gitblit v1.9.1