From 80170efc9637a7d9a4bd50b4801a977d3621ae3f Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Tue, 13 Jun 2023 09:20:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=80=E6=AC=BE=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/service/OrderService.java     |  1 +
 .../adapay/service/AdapayMemberService.java   |  7 +++++++
 .../pile/vo/web/OrderDetailInfoVO.java        |  3 +++
 .../src/views/order/order/orderDetail.vue     | 19 -------------------
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index bb1cbbf67..d9a221a01 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -884,6 +884,7 @@ public class OrderService {
 			payInfo.setPayAmount(bigDecimal.toString());
 			payInfo.setPayStatus(orderBasicInfo.getPayStatus());
 			payInfo.setPayTime(DateUtils.formatDateTime(orderBasicInfo.getPayTime()));
+			payInfo.setRefundAmount(orderPayRecord.getRefundAmount().toString());
 			String payMode = orderPayRecord.getPayMode();
 			if (StringUtils.equals(payMode, OrderPayRecordEnum.PRINCIPAL_BALANCE_PAYMENT.getValue())
 					|| StringUtils.equals(payMode, OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue())) {
diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java
index 798a42154..e2f01f133 100644
--- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java
@@ -140,4 +140,11 @@ public class AdapayMemberService {
         adapaySettleAccount.setAreaCode(dto.getAreaCode());
         adapaySettleAccountService.insertAdapaySettleAccount(adapaySettleAccount);
     }
+
+    /**
+     * 查询汇付会员账户余额
+     */
+    public void queryAdapayAccountBalance() {
+
+    }
 }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
index c55e89f78..e16b221a8 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
@@ -29,6 +29,8 @@ public class OrderDetailInfoVO {
 	// 支付信息
 	private List<PayRecord> payRecordList;
 
+
+
 	// 枪口监控信息
 	private List<PileMonitorData> realTimeMonitorDataList;
 
@@ -64,6 +66,7 @@ public class OrderDetailInfoVO {
 		private String payTime; // 支付时间
 		private String outTradeNo; // 微信商户订单号  real_time_monitor_data
 		private String transactionId; // 微信支付订单号
+		private String refundAmount; // 退款金额
 	}
 
 	@Data
diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue
index 773dcfe19..7093614a1 100644
--- a/jsowell-ui/src/views/order/order/orderDetail.vue
+++ b/jsowell-ui/src/views/order/order/orderDetail.vue
@@ -173,25 +173,6 @@
       <div class="marginTop"></div>
     </el-card>
 
-    <!-- 退款信息 -->
-    <el-card class="cardStyle">
-      <h3>退款信息</h3>
-      <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="payStatus" label="支付状态" align="center">
-          <template slot-scope="scope">
-            <span>{{
-                scope.row.payStatus === "1" ? "支付完成" : "待支付"
-              }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="payTime" label="支付时间" align="center"/>
-        <el-table-column prop="outTradeNo" label="商务单号" align="center"/>
-      </el-table>
-      <div class="marginTop"></div>
-    </el-card>
-
     <!--  设备信息  -->
     <el-card class="cardStyle">
       <h3>设备信息</h3>