feat(订单): 扩展订单查询接口以支持企业微信用户
修改订单查询接口,增加对企业微信用户ID的支持 当qyUserId存在时使用新接口查询,否则使用原有接口 更新所有调用getOrders的地方传递corpid和qyUserId参数
This commit is contained in:
parent
d37dba9206
commit
df72e1317c
|
@ -50,9 +50,18 @@ export function qyLogin(params: QyLoginRequestParams) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 根据openid获取用户订单信息 */
|
/** 根据openid获取用户订单信息 */
|
||||||
export function getOrdersByOpenIdApi(openid: string) {
|
export function getOrdersByOpenIdApi(corpid: string, openid: string) {
|
||||||
return request<ApiResponseData<GetOrdersByOpenIdDTO>>({
|
return request<ApiResponseData<GetOrdersByOpenIdDTO>>({
|
||||||
url: `order/user/${openid}`,
|
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"
|
method: "get"
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -126,7 +126,8 @@ const handleSubmit = async () => {
|
||||||
const { code, data } = await submitApprovalApi(formData.value)
|
const { code, data } = await submitApprovalApi(formData.value)
|
||||||
|
|
||||||
if (code === 0) {
|
if (code === 0) {
|
||||||
orderStore.getOrders(wxStore.openid);
|
orderStore.getOrders(wxStore.corpid, wxStore.openid, wxStore.qyUserId);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await showConfirmDialog({
|
await showConfirmDialog({
|
||||||
title: "提交成功",
|
title: "提交成功",
|
||||||
|
|
|
@ -50,7 +50,7 @@ function backToHome() {
|
||||||
}
|
}
|
||||||
|
|
||||||
watch(() => orderId.value, async (newVal) => {
|
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)
|
currentOrder.value = orderStore.orders.find(o => o.orderId === newVal)
|
||||||
}, { immediate: true })
|
}, { immediate: true })
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -8,11 +8,11 @@ const orderStore = useOrderStore()
|
||||||
const wxStore = useWxStoreOutside()
|
const wxStore = useWxStoreOutside()
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
orderStore.getOrders(wxStore.openid)
|
orderStore.getOrders(wxStore.corpid, wxStore.openid, wxStore.qyUserId)
|
||||||
})
|
})
|
||||||
|
|
||||||
onBeforeRouteUpdate(() => {
|
onBeforeRouteUpdate(() => {
|
||||||
orderStore.getOrders(wxStore.openid)
|
orderStore.getOrders(wxStore.corpid, wxStore.openid, wxStore.qyUserId)
|
||||||
})
|
})
|
||||||
|
|
||||||
const statusMap: Record<number, string> = {
|
const statusMap: Record<number, string> = {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { pinia } from "@/pinia"
|
import { pinia } from "@/pinia"
|
||||||
import { getOrdersByOpenIdApi } from "@@/apis/shop"
|
import { getOrdersByOpenIdApi, getOrdersByQyUserIdApi } from "@@/apis/shop"
|
||||||
import type { ShopOrderEntity, ShopOrderGoodsEntity, Goods } from "@@/apis/shop/type"
|
import type { ShopOrderEntity, ShopOrderGoodsEntity, Goods } from "@@/apis/shop/type"
|
||||||
|
|
||||||
export interface Order extends ShopOrderEntity {
|
export interface Order extends ShopOrderEntity {
|
||||||
|
@ -16,9 +16,11 @@ export const useOrderStore = defineStore("order", () => {
|
||||||
const orderGoods = ref<ShopOrderGoodsEntity[]>([])
|
const orderGoods = ref<ShopOrderGoodsEntity[]>([])
|
||||||
const goods = ref<Goods[]>([])
|
const goods = ref<Goods[]>([])
|
||||||
|
|
||||||
const getOrders = async (openid: string) => {
|
const getOrders = async (corpid: string, openid: string, qyUserId: number) => {
|
||||||
try {
|
try {
|
||||||
const { data } = await getOrdersByOpenIdApi(openid)
|
const { data } = qyUserId ?
|
||||||
|
await getOrdersByQyUserIdApi(qyUserId)
|
||||||
|
: await getOrdersByOpenIdApi(corpid, openid);
|
||||||
|
|
||||||
// 重组订单结构
|
// 重组订单结构
|
||||||
orders.value = data.orders.map(order => ({
|
orders.value = data.orders.map(order => ({
|
||||||
|
|
Loading…
Reference in New Issue