From b116e1e4ba1f37a6be870e03450ec516c41565e8 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Wed, 11 Sep 2024 15:04:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/config/ThreadPoolConfig.java    |  4 +-
 .../src/views/order/order/orderDetail.vue     | 46 +++----------------
 2 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/jsowell-framework/src/main/java/com/jsowell/framework/config/ThreadPoolConfig.java b/jsowell-framework/src/main/java/com/jsowell/framework/config/ThreadPoolConfig.java
index 729c46d9c..9264cfe20 100644
--- a/jsowell-framework/src/main/java/com/jsowell/framework/config/ThreadPoolConfig.java
+++ b/jsowell-framework/src/main/java/com/jsowell/framework/config/ThreadPoolConfig.java
@@ -45,7 +45,7 @@ public class ThreadPoolConfig {
 		executor.setKeepAliveSeconds(keepAliveSeconds);
 		// 线程池对拒绝任务(无线程可用)的处理策略
 		executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
-		log.info("threadPoolTaskExecutor创建成功");
+		// log.info("threadPoolTaskExecutor创建成功");
 		return executor;
 	}
 
@@ -54,7 +54,7 @@ public class ThreadPoolConfig {
 	 */
 	@Bean(name = "scheduledExecutorService")
 	protected ScheduledExecutorService scheduledExecutorService() {
-		log.info("scheduledExecutorService创建成功");
+		// log.info("scheduledExecutorService创建成功");
 		return new ScheduledThreadPoolExecutor(corePoolSize,
 				new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build(),
 				new ThreadPoolExecutor.CallerRunsPolicy()) {
diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue
index 53845475a..74af22236 100644
--- a/jsowell-ui/src/views/order/order/orderDetail.vue
+++ b/jsowell-ui/src/views/order/order/orderDetail.vue
@@ -201,46 +201,12 @@
     <!-- 支付信息 -->
     <el-card class="cardStyle">
       <h3>支付信息</h3>
-      <template v-if="payDetail.length !== 0">
-        <!--<el-descriptions
-          direction="vertical"
-          :column="6"
-          border
-          :contentStyle="CS"
-          :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>
+      <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>
       <div class="marginTop"></div>
     </el-card>
     <!--  退款信息  -->