From e7bc7fa292a62a1a751034ab65dcf29fd4130326 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 31 Oct 2023 11:47:07 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=98=BE=E7=A4=BA=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=92=8C=E6=8F=90=E7=8E=B0=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/pile/vo/web/MerchantClearingBillVO.java | 3 +++ .../main/resources/mapper/pile/ClearingBillInfoMapper.xml | 4 +++- jsowell-ui/src/views/financial/financeDetail.vue | 8 ++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantClearingBillVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantClearingBillVO.java index 759be6d48..f20eedf3b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantClearingBillVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantClearingBillVO.java @@ -46,4 +46,7 @@ public class MerchantClearingBillVO { // 提现单号 private String withdrawCode; + + // 提现申请时间 + private String applicationTime; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml index 2ff38f6b2..db04e8aa1 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml @@ -774,9 +774,11 @@ t1.actual_clearing_amount as actualClearingAmount, t1.fee_amount as feeAmount, t1.withdrawable_amount as withdrawAbleAmount, - t1.withdraw_code as withdrawCode + t1.withdraw_code as withdrawCode, + t3.application_time as applicationTime from clearing_bill_info t1 join pile_merchant_info t2 on t1.merchant_id = t2.id and t1.del_flag = '0' + join clearing_withdraw_info t3 on t3.withdraw_code = t1.withdraw_code and t3.del_flag = '0' where t1.merchant_id = #{merchantId,jdbcType=VARCHAR} and t1.trade_date between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR} order by diff --git a/jsowell-ui/src/views/financial/financeDetail.vue b/jsowell-ui/src/views/financial/financeDetail.vue index 7429dfe80..c05636bd8 100644 --- a/jsowell-ui/src/views/financial/financeDetail.vue +++ b/jsowell-ui/src/views/financial/financeDetail.vue @@ -260,12 +260,8 @@ align="center" prop="clearingBillCode" /> --> - - + +