autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-03 05:28:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 显示提现单号和提现申请时间

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-10-31 11:47:07 +08:00
parent a1d9480706
commit e7bc7fa292
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantClearingBillVO.java
View File

@@ -46,4 +46,7 @@ public class MerchantClearingBillVO {
// 提现单号 // 提现单号
private String withdrawCode; private String withdrawCode;
// 提现申请时间
private String applicationTime;
} }

4
jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml
View File

@@ -774,9 +774,11 @@
t1.actual_clearing_amount as actualClearingAmount, t1.actual_clearing_amount as actualClearingAmount,
t1.fee_amount as feeAmount, t1.fee_amount as feeAmount,
t1.withdrawable_amount as withdrawAbleAmount, 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 from clearing_bill_info t1
join pile_merchant_info t2 on t1.merchant_id = t2.id and t1.del_flag = '0' 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} where t1.merchant_id = #{merchantId,jdbcType=VARCHAR}
and t1.trade_date between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR} and t1.trade_date between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
order by order by

8
jsowell-ui/src/views/financial/financeDetail.vue
View File

@@ -260,12 +260,8 @@
align="center" align="center"
prop="clearingBillCode" prop="clearingBillCode"
/> --> /> -->
<el-table-column label="提现订单号" align="center" prop=" withdrawCode" /> <el-table-column label="提现订单号" align="center" prop="withdrawCode" />
<el-table-column <el-table-column label="提现申请时间" align="center" prop="applicationTime"/>
label="提现申请时间"
align="center"
prop="withdrawalTime"
/>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="link-type" @click="goTradeDate(scope)">订单流水</span> <span class="link-type" @click="goTradeDate(scope)">订单流水</span>