From d74349c69e6f9959d407026a57f79973ede9dee8 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Wed, 11 Sep 2024 14:45:44 +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

---
 .../impl/OrderBasicInfoServiceImpl.java        |  2 +-
 .../src/views/order/order/orderDetail.vue      | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index 72011baf1..28b7dceb7 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -1287,7 +1287,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
             logger.info("订单分账逻辑, 运营商id:{}, 非延时分账商户, 不进行订单分账处理", merchantId);
             return;
         }
-        
+
         // 查询运营商有没有开通结算账户
         AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId);
         if (adapayMemberAccount == null) {
diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue
index c21937b52..7462c84cd 100644
--- a/jsowell-ui/src/views/order/order/orderDetail.vue
+++ b/jsowell-ui/src/views/order/order/orderDetail.vue
@@ -168,7 +168,7 @@
         <!-- 支付信息 -->
         <el-card class="cardStyle">
             <h3>支付信息</h3>
-            <template v-if="payDetail.length !== 0">
+<!--            <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="支付金额">{{
@@ -179,10 +179,10 @@
                             item.payModeDesc
                         }}
                     </el-descriptions-item>
-                    <!--<el-descriptions-item label="支付状态">{{
+                    &lt;!&ndash;<el-descriptions-item label="支付状态">{{
                       item.payStatus === "1" ? "支付完成" : "待支付"
                     }}
-                    </el-descriptions-item>-->
+                    </el-descriptions-item>&ndash;&gt;
                     <el-descriptions-item label="支付时间">{{
                             item.payTime
                         }}
@@ -191,12 +191,18 @@
                             item.outTradeNo
                         }}
                     </el-descriptions-item>
-                    <!--<el-descriptions-item label="退款金额">{{
+                    &lt;!&ndash;<el-descriptions-item label="退款金额">{{
                             item.refundAmount
                         }}
-                    </el-descriptions-item>-->
+                    </el-descriptions-item>&ndash;&gt;
                 </el-descriptions>
-            </template>
+            </template>-->
+            <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 v-else style="text-align: center">暂无数据</div>
             <div class="marginTop"></div>
         </el-card>