From 357fc451bfa2dd1e535e799045130ca04df89354 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Mon, 16 Dec 2019 23:18:13 +0800
Subject: [PATCH] =?UTF-8?q?feat[litemall-admin,=20litemall-admin-api]:=20?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E6=98=BE=E7=A4=BA=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../litemall/admin/service/AdminOrderService.java         | 8 +++++++-
 litemall-admin/src/views/mall/order.vue                   | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java
index e271d230..cb56fdd4 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java
@@ -136,9 +136,15 @@ public class AdminOrderService {
             return ResponseUtil.fail(ORDER_REFUND_FAILED, "订单退款失败");
         }
 
+        LocalDateTime now = LocalDateTime.now();
         // 设置订单取消状态
         order.setOrderStatus(OrderUtil.STATUS_REFUND_CONFIRM);
-        order.setEndTime(LocalDateTime.now());
+        order.setEndTime(now);
+        // 记录订单退款相关信息
+        order.setRefundAmount(order.getActualPrice());
+        order.setRefundType("微信退款接口");
+        order.setRefundContent(wxPayRefundResult.getRefundId());
+        order.setRefundTime(now);
         if (orderService.updateWithOptimisticLocker(order) == 0) {
             throw new RuntimeException("更新数据已失效");
         }
diff --git a/litemall-admin/src/views/mall/order.vue b/litemall-admin/src/views/mall/order.vue
index 055c3c45..bf74e0be 100644
--- a/litemall-admin/src/views/mall/order.vue
+++ b/litemall-admin/src/views/mall/order.vue
@@ -99,6 +99,12 @@
             <span>（快递单号）{{ orderDetail.order.shipSn }}</span>
             <span>（发货时间）{{ orderDetail.order.shipTime }}</span>
           </el-form-item>
+          <el-form-item label="退款信息">
+            <span>（退款金额）{{ orderDetail.order.refundAmount }}元</span>
+            <span>（退款类型）{{ orderDetail.order.refundType }}</span>
+            <span>（退款备注）{{ orderDetail.order.refundContent }}</span>
+            <span>（退款时间）{{ orderDetail.order.refundTime }}</span>
+          </el-form-item>
           <el-form-item label="收货信息">
             <span>（确认收货时间）{{ orderDetail.order.confirmTime }}</span>
           </el-form-item>