From df72e1317c90a08ddab37db78a05f783c60581c4 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Fri, 20 Jun 2025 16:19:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95):=20=E6=89=A9=E5=B1=95?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BB=A5?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改订单查询接口，增加对企业微信用户ID的支持
当qyUserId存在时使用新接口查询，否则使用原有接口
更新所有调用getOrders的地方传递corpid和qyUserId参数
---
 src/common/apis/shop/index.ts            | 11 ++++++++++-
 src/pages/approval/submit.vue            |  3 ++-
 src/pages/order/Success.vue              |  2 +-
 src/pages/order/components/OrderList.vue |  4 ++--
 src/pinia/stores/order.ts                |  8 +++++---
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/common/apis/shop/index.ts b/src/common/apis/shop/index.ts
index e812d44..72ec1a6 100644
--- a/src/common/apis/shop/index.ts
+++ b/src/common/apis/shop/index.ts
@@ -50,9 +50,18 @@ export function qyLogin(params: QyLoginRequestParams) {
 }
 
 /** 根据openid获取用户订单信息 */
-export function getOrdersByOpenIdApi(openid: string) {
+export function getOrdersByOpenIdApi(corpid: string, openid: string) {
   return request<ApiResponseData<GetOrdersByOpenIdDTO>>({
     url: `order/user/${openid}`,
+    method: "get",
+    params: { corpid }
+  })
+}
+
+/** 根据openid获取用户订单信息 */
+export function getOrdersByQyUserIdApi(qyUserId: number) {
+  return request<ApiResponseData<GetOrdersByOpenIdDTO>>({
+    url: `order/user/qy/${qyUserId}`,
     method: "get"
   })
 }
diff --git a/src/pages/approval/submit.vue b/src/pages/approval/submit.vue
index 7d78d7f..346a78e 100644
--- a/src/pages/approval/submit.vue
+++ b/src/pages/approval/submit.vue
@@ -126,7 +126,8 @@ const handleSubmit = async () => {
         const { code, data } = await submitApprovalApi(formData.value)
 
         if (code === 0) {
-            orderStore.getOrders(wxStore.openid);
+            orderStore.getOrders(wxStore.corpid, wxStore.openid, wxStore.qyUserId);
+
             try {
                 await showConfirmDialog({
                     title: "提交成功",
diff --git a/src/pages/order/Success.vue b/src/pages/order/Success.vue
index 52d9d59..4917abe 100644
--- a/src/pages/order/Success.vue
+++ b/src/pages/order/Success.vue
@@ -50,7 +50,7 @@ function backToHome() {
 }
 
 watch(() => orderId.value, async (newVal) => {
-  await orderStore.getOrders(wxStore.openid)
+  await orderStore.getOrders(wxStore.corpid, wxStore.openid, wxStore.qyUserId)
   currentOrder.value = orderStore.orders.find(o => o.orderId === newVal)
 }, { immediate: true })
 </script>
diff --git a/src/pages/order/components/OrderList.vue b/src/pages/order/components/OrderList.vue
index 05442fd..16c4b8e 100644
--- a/src/pages/order/components/OrderList.vue
+++ b/src/pages/order/components/OrderList.vue
@@ -8,11 +8,11 @@ const orderStore = useOrderStore()
 const wxStore = useWxStoreOutside()
 
 onMounted(() => {
-  orderStore.getOrders(wxStore.openid)
+  orderStore.getOrders(wxStore.corpid, wxStore.openid, wxStore.qyUserId)
 })
 
 onBeforeRouteUpdate(() => {
-  orderStore.getOrders(wxStore.openid)
+  orderStore.getOrders(wxStore.corpid, wxStore.openid, wxStore.qyUserId)
 })
 
 const statusMap: Record<number, string> = {
diff --git a/src/pinia/stores/order.ts b/src/pinia/stores/order.ts
index 67506e5..4011669 100644
--- a/src/pinia/stores/order.ts
+++ b/src/pinia/stores/order.ts
@@ -1,5 +1,5 @@
 import { pinia } from "@/pinia"
-import { getOrdersByOpenIdApi } from "@@/apis/shop"
+import { getOrdersByOpenIdApi, getOrdersByQyUserIdApi } from "@@/apis/shop"
 import type { ShopOrderEntity, ShopOrderGoodsEntity, Goods } from "@@/apis/shop/type"
 
 export interface Order extends ShopOrderEntity {
@@ -16,9 +16,11 @@ export const useOrderStore = defineStore("order", () => {
   const orderGoods = ref<ShopOrderGoodsEntity[]>([])
   const goods = ref<Goods[]>([])
 
-  const getOrders = async (openid: string) => {
+  const getOrders = async (corpid: string, openid: string, qyUserId: number) => {
     try {
-      const { data } = await getOrdersByOpenIdApi(openid)
+      const { data } = qyUserId ? 
+      await getOrdersByQyUserIdApi(qyUserId) 
+      : await getOrdersByOpenIdApi(corpid, openid);
       
       // 重组订单结构
       orders.value = data.orders.map(order => ({