feat: 售后页面多余接口调用问题
This commit is contained in:
@@ -153,12 +153,16 @@
|
||||
};
|
||||
// 申请售后
|
||||
const applyAfterSale = () => {
|
||||
const source = String(props?.data?.__source || props?.data?.source || '').trim();
|
||||
const __src = String(props?.data?.__source || props?.data?.source || '').trim();
|
||||
const __ty = String(props?.data?.type || '').trim();
|
||||
// 避免把整个订单对象里的同名字段 type/source/__source 直接展开污染 query(
|
||||
// 否则普通商城订单也可能因为 data.type=5(或商城订单里的其他数字type)在 apply.vue 里误走 ai 接口)。
|
||||
sheep.$router.go('/pages/order/aftersale/apply', {
|
||||
...props.data,
|
||||
id: props?.data?.id,
|
||||
orderId: props?.data?.id,
|
||||
...(source ? { source } : {}),
|
||||
no: props?.data?.no,
|
||||
...(__src ? { source: __src } : {}),
|
||||
...(__ty ? { openOrderType: __ty } : {}),
|
||||
});
|
||||
};
|
||||
// 确认收货
|
||||
|
||||
@@ -133,6 +133,7 @@
|
||||
orderId: props.data.id,
|
||||
itemId: v.id,
|
||||
source: String(props.source || props.data?.__source || props.data?.source || '').trim(),
|
||||
openOrderType: String(props.data?.type || ''),
|
||||
})
|
||||
"
|
||||
>
|
||||
|
||||
@@ -234,7 +234,11 @@
|
||||
// 解析参数:兼容单品入口(传orderId+itemId)和整单入口(传订单对象即props.data.id)
|
||||
const orderId = parseInt(options.orderId || options.id);
|
||||
const itemId = options.itemId ? parseInt(options.itemId) : 0;
|
||||
const source = String(options.source || options.orderSource || '').trim();
|
||||
// 订单来源:'aishop' = 普通店铺订单;空=普通商城订单。
|
||||
// 注:用 source/__source/orderSource 三个命名从 options 里读,但 NEVER 从整个订单对象里读"同名字段 type"来判断是否开通店铺订单。
|
||||
const source = String(options.source || options.orderSource || options.__source || '').trim();
|
||||
// 开通店铺订单标记:只从 openOrderType / openOrder 里读(而不是订单对象里通用的 type 字段,避免普通商城订单的 type=0~4 被误命中)。
|
||||
const openOrderType = String(options.openOrderType || options.openOrder || '').trim();
|
||||
if (!orderId) {
|
||||
sheep.$helper.toast(`缺少订单信息,请检查`);
|
||||
return;
|
||||
@@ -243,26 +247,42 @@
|
||||
state.itemId = itemId;
|
||||
state.source = source;
|
||||
|
||||
// 读取订单详情:按订单来源分流
|
||||
// aishop 普通店铺订单 → /aishop/order/get-detail
|
||||
// aishop 开通店铺订单 type===5 → /aishop/order/get-detail-open
|
||||
// 普通商城订单(默认兜底) → /trade/order/get-detail
|
||||
// 读取订单详情:严格按入口参数分流,禁止普通商城订单 / 普通店铺订单误调开通店铺接口 /aishop/order/get-detail-open
|
||||
//
|
||||
// 开通店铺订单(ONLY:openOrderType === '5')
|
||||
// → /aishop/order/get-detail-open
|
||||
// 普通店铺订单(source === 'aishop' && 不是开通店铺)
|
||||
// → /aishop/order/get-detail
|
||||
// 普通商城订单(其他任何情况,包括没传 source/type 都算普通商城兜底)
|
||||
// → /trade/order/get-detail ONLY
|
||||
//
|
||||
// 最后一道保险:如果我们选择了 getOpenOrderDetail,但返回的数据类型不是 5,说明命中错误 → 自动回退到对应接口。
|
||||
let detailResult = null;
|
||||
try {
|
||||
// 开通店铺订单(type===5)优先:先用 getOpenOrderDetail 试一次,命中 type===5 直接用
|
||||
const openRes = await getOpenOrderDetail({ id: state.orderId });
|
||||
if (openRes?.code === 0 && openRes?.data && Number(openRes.data?.type) === 5) {
|
||||
detailResult = openRes;
|
||||
}
|
||||
} catch (e) {}
|
||||
if (!detailResult) {
|
||||
if (source === 'aishop') {
|
||||
const aiRes = await getAiOrderDetail({ id: state.orderId });
|
||||
if (aiRes?.code === 0 && aiRes?.data) detailResult = aiRes;
|
||||
} else {
|
||||
const mallRes = await OrderApi.getOrderDetail(state.orderId);
|
||||
if (mallRes?.code === 0 && mallRes?.data) detailResult = mallRes;
|
||||
}
|
||||
const isOpenOrder = openOrderType === '5';
|
||||
const isAiStoreOrder = source === 'aishop';
|
||||
|
||||
async function loadMallOrder() {
|
||||
return OrderApi.getOrderDetail(state.orderId);
|
||||
}
|
||||
async function loadAiOrder() {
|
||||
return getAiOrderDetail({ id: state.orderId });
|
||||
}
|
||||
async function loadOpenOrder() {
|
||||
const res = await getOpenOrderDetail({ id: state.orderId });
|
||||
if (res?.code === 0 && res?.data && Number(res.data?.type) === 5) return res;
|
||||
// 开了 openOrderType=5 但接口返回并不是 type=5 → 回退:按是否 aishop 来源决定
|
||||
return isAiStoreOrder ? loadAiOrder() : loadMallOrder();
|
||||
}
|
||||
|
||||
if (isOpenOrder) {
|
||||
// 只有入口明确传 openOrderType=5 才调用开通店铺接口;返回不满足 type===5 时内部自动回退
|
||||
detailResult = await loadOpenOrder();
|
||||
} else if (isAiStoreOrder) {
|
||||
// 普通店铺订单:只调店铺详情接口 /aishop/order/get-detail;绝对不碰 /get-detail-open
|
||||
detailResult = await loadAiOrder();
|
||||
} else {
|
||||
// ★ 普通商城订单:只调 /trade/order/get-detail;永远不请求任何 aishop 前缀的接口
|
||||
detailResult = await loadMallOrder();
|
||||
}
|
||||
if (!detailResult) {
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user