From 848a1f9caf6f7e7efe7c65b770cea3ad52512496 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 17 Apr 2023 17:47:41 +0800
Subject: [PATCH] 提现,增加实际到账金额

---
 src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html |    1 +
 src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java               |    2 ++
 src/main/resources/mapper/modules/MallMoneyFlowMapper.xml                      |    1 +
 3 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java
index 7e7d16a..1720ac6 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java
@@ -20,6 +20,8 @@
 
     private BigDecimal amountFee;
 
+    private BigDecimal amountReal;
+
     private String withdrawNo;
 
     private Integer status;
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 7fecd36..814e3bd 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -72,6 +72,7 @@
         a.created_time createdTime,
         a.amount amount,
         a.amount_fee amountFee,
+        (a.amount-a.amount_fee) amountReal,
         a.withdraw_no withdrawNo,
         a.remark remark,
         a.status status,
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
index 02ce73e..8356371 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
@@ -147,6 +147,7 @@
                         }, minWidth: 80,align:'center'},
                     {field: 'amount', title: '金额', minWidth: 150,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
                     {field: 'amountFee', title: '手续费', minWidth: 150,align:'left',totalRow: '{{= parseInt(d.amountFee) }}'},
+                    {field: 'amountReal', title: '实际到账', minWidth: 150,align:'left',totalRow: '{{= parseInt(d.amountReal) }}'},
                     {field: 'scoreCnt', title: '数量', minWidth: 80,align:'left',totalRow: '{{= parseInt(d.scoreCnt) }}'},
                     {field: 'scorePrice', title: '价格', minWidth: 80,align:'left',totalRow: '{{= parseInt(d.scorePrice) }}'},
                     {field: 'status', title: '状态',

--
Gitblit v1.9.1