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

修改支付记录展示

Browse Source
This commit is contained in:
Guoqs
2024-09-11 15:04:29 +08:00
parent 1c349817b3
commit b116e1e4ba
2 changed files with 8 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-framework/src/main/java/com/jsowell/framework/config/ThreadPoolConfig.java
View File

@@ -45,7 +45,7 @@ public class ThreadPoolConfig {
executor.setKeepAliveSeconds(keepAliveSeconds); executor.setKeepAliveSeconds(keepAliveSeconds);
// 线程池对拒绝任务(无线程可用)的处理策略 // 线程池对拒绝任务(无线程可用)的处理策略
executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
log.info("threadPoolTaskExecutor创建成功"); // log.info("threadPoolTaskExecutor创建成功");
return executor; return executor;
} }
@@ -54,7 +54,7 @@ public class ThreadPoolConfig {
*/ */
@Bean(name = "scheduledExecutorService") @Bean(name = "scheduledExecutorService")
protected ScheduledExecutorService scheduledExecutorService() { protected ScheduledExecutorService scheduledExecutorService() {
log.info("scheduledExecutorService创建成功"); // log.info("scheduledExecutorService创建成功");
return new ScheduledThreadPoolExecutor(corePoolSize, return new ScheduledThreadPoolExecutor(corePoolSize,
new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build(), new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build(),
new ThreadPoolExecutor.CallerRunsPolicy()) { new ThreadPoolExecutor.CallerRunsPolicy()) {

46
jsowell-ui/src/views/order/order/orderDetail.vue
View File

@@ -201,46 +201,12 @@
<!-- 支付信息 --> <!-- 支付信息 -->
<el-card class="cardStyle"> <el-card class="cardStyle">
<h3>支付信息</h3> <h3>支付信息</h3>
<template v-if="payDetail.length !== 0"> <el-table style="width: 100%" :data="payDetail" border>
<!--<el-descriptions <el-table-column prop="payAmount" label="支付金额" align="center" />
direction="vertical" <el-table-column prop="payModeDesc" label="支付方式" align="center" />
:column="6" <el-table-column prop="payTime" label="支付时间" align="center" />
border <el-table-column prop="outTradeNo" label="支付流水号" align="center" />
:contentStyle="CS" </el-table>
:label-style="LS"
v-for="(item, index) in payDetail"
:key="index"
>
<el-descriptions-item label="支付金额"
>{{ item.payAmount }}
</el-descriptions-item>
<el-descriptions-item label="支付方式"
>{{ item.payModeDesc }}
</el-descriptions-item>
&lt;!&ndash;<el-descriptions-item label="支付状态">{{
item.payStatus === "1" ? "支付完成" : "待支付"
}}
</el-descriptions-item>&ndash;&gt;
<el-descriptions-item label="支付时间"
>{{ item.payTime }}
</el-descriptions-item>
<el-descriptions-item label="支付流水号"
>{{ item.outTradeNo }}
</el-descriptions-item>
&lt;!&ndash;<el-descriptions-item label="退款金额">{{
item.refundAmount
}}
</el-descriptions-item>&ndash;&gt;
</el-descriptions>-->
<el-table style="width: 100%" :data="payDetail" border>
<el-table-column prop="payAmount" label="支付金额" align="center" />
<el-table-column prop="payModeDesc" label="支付方式" align="center" />
<el-table-column prop="payTime" label="支付时间" align="center" />
<el-table-column prop="outTradeNo" label="支付流水号" align="center" />
</el-table>
</template>
<div v-else style="text-align: center">暂无数据</div>
<div class="marginTop"></div> <div class="marginTop"></div>
</el-card> </el-card>
<!-- 退款信息 --> <!-- 退款信息 -->