Browse Source

feat[litemall-admin, litemall-admin-api]: 管理后台显示退款信息详情

Junling Bu 6 years ago
parent
commit
357fc451bf

+ 7 - 1
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("更新数据已失效");
         }

+ 6 - 0
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>