From 2dd9a0546e1ce4ced83853ffe73927fb40f349a5 Mon Sep 17 00:00:00 2001
From: franktrue <fnf@yexingxia.com>
Date: Mon, 8 May 2023 12:25:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B7=AF=E7=94=B1=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/cert/usageRecord.js    |  9 +++++++++
 src/api/order/order.js         |  9 +++++++++
 src/views/user/money/index.vue | 12 +++---------
 src/views/user/usage/index.vue | 13 +++----------
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/api/cert/usageRecord.js b/src/api/cert/usageRecord.js
index e5026f9..059da97 100644
--- a/src/api/cert/usageRecord.js
+++ b/src/api/cert/usageRecord.js
@@ -9,6 +9,15 @@ export function listUsageRecord(query) {
   })
 }
 
+// 查询当前用户使用记录列表
+export function currentUserListUsageRecord(query) {
+  return request({
+    url: '/cert/usageRecord/currentUser/list',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询使用记录详细
 export function getUsageRecord(id) {
   return request({
diff --git a/src/api/order/order.js b/src/api/order/order.js
index a92bc30..6e20ec7 100644
--- a/src/api/order/order.js
+++ b/src/api/order/order.js
@@ -9,6 +9,15 @@ export function listOrder(query) {
   })
 }
 
+// 查询当前订单列表
+export function currentUserListOrder(query) {
+  return request({
+    url: '/order/order/currentUser/list',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询订单详细
 export function getOrder(id) {
   return request({
diff --git a/src/views/user/money/index.vue b/src/views/user/money/index.vue
index b65f36a..9ba69d5 100644
--- a/src/views/user/money/index.vue
+++ b/src/views/user/money/index.vue
@@ -70,7 +70,7 @@
 
 <script setup name="money">
 import { payment, refreshStatus }  from "@/api/order/payment";
-import { listOrder } from "@/api/order/order";
+import { currentUserListOrder } from "@/api/order/order";
 import { getUserProfile } from "@/api/system/user";
 
 const { proxy } = getCurrentInstance();
@@ -98,12 +98,6 @@ const data = reactive({
   },
 })
 const { queryParams, form } = toRefs(data);
-function getUser() {
-  getUserProfile().then(response => {
-    queryParams.value.userId = response.data.userId
-    getList()
-  });
-};
 
 // 发起支付
 function handlePayment() {
@@ -138,14 +132,14 @@ function cancel() {
 function getList() {
   loading.value = true;
   queryParams.value.params = {};
-  listOrder(queryParams.value).then(response => {
+  currentUserListOrder(queryParams.value).then(response => {
     orderList.value = response.rows;
     total.value = response.total;
     loading.value = false;
   });
 }
 
-getUser()
+getList()
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/user/usage/index.vue b/src/views/user/usage/index.vue
index 6f83edc..f633496 100644
--- a/src/views/user/usage/index.vue
+++ b/src/views/user/usage/index.vue
@@ -50,7 +50,7 @@
  </template>
  
  <script setup name="usage">
-import { listUsageRecord } from "@/api/cert/usageRecord";
+import { currentUserListUsageRecord } from "@/api/cert/usageRecord";
 import { getUserProfile } from "@/api/system/user";
 
 const { proxy } = getCurrentInstance();
@@ -72,17 +72,10 @@ const data = reactive({
 
 const { queryParams } = toRefs(data);
 
-function getUser() {
-  getUserProfile().then(response => {
-    queryParams.value.userId = response.data.userId
-    getList()
-  });
-};
-
 /** 查询使用记录列表 */
 function getList() {
   loading.value = true;
-  listUsageRecord(queryParams.value).then(response => {
+  currentUserListUsageRecord(queryParams.value).then(response => {
     usageRecordList.value = response.rows;
     total.value = response.total;
     loading.value = false;
@@ -100,7 +93,7 @@ function resetQuery() {
   handleQuery();
 }
 
-getUser()
+getList()
 </script>
  
  <style scoped lang="scss">