From 5968eaf2a674bd890ed9f7d7d71a7db6ffdf342a Mon Sep 17 00:00:00 2001
From: admin-lmm <2497833386@QQ.com>
Date: Thu, 31 Aug 2023 16:42:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/order/order/orderDetail.vue     | 70 +++++++++----------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue
index 3c6658d2f..053c6f652 100644
--- a/jsowell-ui/src/views/order/order/orderDetail.vue
+++ b/jsowell-ui/src/views/order/order/orderDetail.vue
@@ -192,37 +192,36 @@
       <div class="marginTop"></div>
     </el-card>
     <!-- 实时订单数据 -->
+
     <el-card class="cardStyle">
       <h3>实时订单数据</h3>
-      <el-table style="width: 100%" :data="orderRealTimeInfo" border>
-        <el-table-column prop="time" label="时间" align="center" />
-        <el-table-column
-          prop="orderAmount"
-          label="消费金额"
-          align="center"
-          width="280"
-        >
-          <template slot-scope="scope">
-            <span
-              >￥{{
-                scope.row.orderAmount === "0.0000" ? "0" : scope.row.orderAmount
-              }}
-            </span>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="chargedDegree" label="充电度数" align="center">
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.chargedDegree === "0.0000"
-                ? "0"
-                : scope.row.chargedDegree
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="chargingTime" label="充电时长" align="center" />
-        <el-table-column prop="soc" label="当前soc" align="center" />
-      </el-table>
+      <el-descriptions
+        direction="vertical"
+        :column="5"
+        border
+        :contentStyle="CS"
+        :label-style="LS"
+      >
+        <el-descriptions-item label="时间">{{
+          orderRealTimeInfo.time
+        }}</el-descriptions-item>
+        <el-descriptions-item label="消费金额">{{
+          orderRealTimeInfo.orderAmount === "0.0000"
+            ? "0"
+            : orderRealTimeInfo.orderAmount
+        }}</el-descriptions-item>
+        <el-descriptions-item label="充电度数">{{
+          orderRealTimeInfo.chargedDegree === "0.0000"
+            ? "0"
+            : orderRealTimeInfo.chargedDegree
+        }}</el-descriptions-item>
+        <el-descriptions-item label="充电时长">{{
+          orderRealTimeInfo.chargingTime
+        }}</el-descriptions-item>
+        <el-descriptions-item label="当前soc">{{
+          orderRealTimeInfo.soc
+        }}</el-descriptions-item>
+      </el-descriptions>
       <div class="marginTop"></div>
     </el-card>
     <!-- 支付信息 -->
@@ -480,21 +479,20 @@ export default {
     },
     async getOrderDetail() {
       const { data } = await getOrder(this.orderCode);
-
-      // console.log("getOrder", data);
+      console.log("getOrder", data);
       this.obj = data;
       this.orderInfo = data.orderInfo;
-      this.payDetail = data.payRecordList;
-      this.orderRefundInfoList = data.orderRefundInfoList;
+      this.payDetail = data.payRecordList; // 数组
+      this.orderRefundInfoList = data.orderRefundInfoList; // 数组
       this.userInfo = [data.memberInfo];
       // console.log("this.userInfo", this.userInfo);
       this.pileIn = [data.pileInfo];
       // console.log("this.pileIn", this.pileIn);
       this.orderRealTimeInfo = data.orderRealTimeInfo;
       this.orderDetail = [data.billingDetails];
-      this.tableData = data.chargeDetails;
+      this.tableData = data.chargeDetails; // array
       this.lastMonitorData = data.lastMonitorData;
-
+      console.log("orderInfo.orderStatus", this.orderInfo.orderStatus);
       // 是否显示重试退款按钮
       // if (data.orderInfo.orderStatus === '6' && data.payRecordList[0].payMode === '4' && data.orderRefundInfoList.length === 0) {
       //   this.retryRefundFlag = true;
@@ -510,7 +508,7 @@ export default {
       if (this.orderInfo == null || this.orderInfo.orderStatus !== "6") {
         return false;
       }
-      if (this.payDetail[0] == null || this.payDetail.payMode[0] !== "4") {
+      if (this.payDetail[0] == null || this.payDetail[0].payMode !== "4") {
         return false;
       }
       if (

From 21e41a9e883c75f63ca16d8ba61fd6ccb9c7965a Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Thu, 31 Aug 2023 16:42:48 +0800
Subject: [PATCH 2/2] update

---
 .../pile/service/impl/OrderBasicInfoServiceImpl.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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 0e5e9d663..8b7b194b8 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
@@ -743,11 +743,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
         }
 
         // 获取结算账户信息
-        AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId);
-        if (adapayMemberAccount == null) {
-            logger.info("订单分账逻辑-订单:{}, 运营商id:{}, 没有配置结算账户信息", orderCode, merchantId);
-            return null;
-        }
+        // AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId);
+        AdapayMemberAccount adapayMemberAccount = null;
+        // if (adapayMemberAccount == null) {
+        //     logger.info("订单分账逻辑-订单:{}, 运营商id:{}, 没有配置结算账户信息", orderCode, merchantId);
+        //     return null;
+        // }
 
         // 获取一级运营商的 延时分账设置
         String delayMode = merchantInfo.getDelayMode();