feat: 开通店铺商品详情、物流接口变更

This commit is contained in:
2026-08-07 14:39:20 +08:00
parent c635215e24
commit 5c71cba575
6 changed files with 86 additions and 18 deletions
+3 -3
View File
@@ -1,8 +1,8 @@
# 版本号
SHOPRO_VERSION=v2.4.1
# 后端接口 - 正式环境(通过 process.env.NODE_ENV 非 development)
# SHOPRO_BASE_URL=https://yougou.api.qflyqzy.net
SHOPRO_BASE_URL=https://yougoutest.api.riananyoumu.com
SHOPRO_BASE_URL=https://yougou.api.qflyqzy.net
# SHOPRO_BASE_URL=https://yougoutest.api.riananyoumu.com
# 后端接口 - 测试环境(通过 process.env.NODE_ENV = development)
@@ -27,7 +27,7 @@ SHOPRO_BASE_URL=https://yougoutest.api.riananyoumu.com
SHOPRO_DEV_BASE_URL=https://yougoutest.api.riananyoumu.com
# 本地
# SHOPRO_DEV_BASE_URL=http://8.136.55.200:48090
# SHOPRO_DEV_BASE_URL=http://192.168.1.3:48080
### SHOPRO_DEV_BASE_URL=http://10.171.1.188:48090
### SHOPRO_DEV_BASE_URL = http://yunai.natapp1.cc
+28 -5
View File
@@ -84,7 +84,7 @@
<script setup>
import { computed, reactive, ref, watch } from 'vue';
import sheep from '@/sheep';
import { getAiOrderDelayRecords } from '@/sheep/api/ai';
import { getAiOrderDelayRecords, getOpenOrderDetail, getOpenOrderExpressTrackList } from '@/sheep/api/ai';
import { getExpressTrackList } from '@/sheep/api/index/index';
const props = defineProps({
@@ -389,11 +389,31 @@ const renderItems = computed(() => innerItems.value || []);
const open = async () => {
loadedRecords.value = [];
const oid = props.orderId || props.orderData?.id || props.orderData?.orderId;
const isOpenOrder = Number(props.orderData?.type) === 5;
if (oid) {
try {
const { code, data } = await getAiOrderDelayRecords({ orderId: oid });
if (code === 0 && Array.isArray(data)) {
loadedRecords.value = data;
if (isOpenOrder) {
// 开通店铺订单:用详情接口获取延迟记录和物流数据,不走延迟记录接口
const { code, data } = await getOpenOrderDetail({ id: oid });
if (code === 0) {
// 更新 props.orderData 引用(因为原 props 可能是旧的)
if (data) {
// 把最新的订单详情中的 delayRecords 取出来作为延迟记录
loadedRecords.value = Array.isArray(data?.delayRecords)
? data.delayRecords
: Array.isArray(data?.delayRecordList)
? data.delayRecordList
: [];
// 同时把最新的 orderData 保存下来,供 loadTrackList 查物流轨迹时用
props.orderData._openOrderDetailData = data;
}
}
} else {
// 正常商城/店铺订单:走专门的延迟记录接口
const { code, data } = await getAiOrderDelayRecords({ orderId: oid });
if (code === 0 && Array.isArray(data)) {
loadedRecords.value = data;
}
}
} catch (e) {
loadedRecords.value = [];
@@ -422,8 +442,11 @@ const loadTrackList = async (item) => {
});
return [];
}
const isOpenOrder = Number(props.orderData?.type) === 5;
// 开通店铺订单(type===5):物流接口 /aishop/app/open/order/get-express-track-list
const requestApi = isOpenOrder ? getOpenOrderExpressTrackList : getExpressTrackList;
try {
const { code, data } = await getExpressTrackList({
const { code, data } = await requestApi({
id,
code: 2,
delayRecordId,
+2 -2
View File
@@ -2,8 +2,8 @@
"name" : "优购商城",
"appid" : "__UNI__8B19741",
"description" : "",
"versionName" : "1.6.9",
"versionCode" : 169,
"versionName" : "1.7.0",
"versionCode" : 170,
"transformPx" : false,
"app-plus" : {
"privacy" : {
+7 -3
View File
@@ -576,10 +576,14 @@
merchant_trade_no: state.merchantTradeNo,
});
} else {
if (String(state.source) === 'aishop') {
res = await getAiOrderDetail({ id });
} else if (String(state.orderType) === '5') {
// 开通店铺订单(type=5)优先级最高,独立接口,不影响正常商城订单/店铺订单
const isOpenOrder =
Number(state.orderInfo?.type) === 5 ||
String(state.orderType) === '5';
if (isOpenOrder) {
res = await getOpenOrderDetail({ id });
} else if (String(state.source) === 'aishop') {
res = await getAiOrderDetail({ id });
} else {
res = await OrderApi.getOrderDetail(id);
}
+37 -4
View File
@@ -58,7 +58,7 @@
import { onLoad } from '@dcloudio/uni-app';
import { computed, reactive } from 'vue';
import OrderApi from '@/sheep/api/trade/order';
import { getOrderDetail as getAiOrderDetail } from '@/sheep/api/ai';
import { getOrderDetail as getAiOrderDetail, getOpenOrderDetail, getOpenOrderExpressTrackList } from '@/sheep/api/ai';
import { getExpressTrackList } from '@/sheep/api/index/index';
import HighlightNumber from '@/pages/components/HighlightNumberText.vue';
@@ -103,6 +103,30 @@
if (id) {
state.info.id = id;
}
// 开通店铺订单(type===5):物流接口 /aishop/app/open/order/get-express-track-list
const isOpenOrder = Number(state.info?.type) === 5;
if (isOpenOrder) {
// 优先传 delayRecordId + code=2;没传 delayRecordId 就只传 code(具体 code 值看原 code 参数)
const params = { id };
if (code === 2 && hasDelayRecordId) {
params.code = 2;
params.delayRecordId = delayRecordId;
} else if (code > 0) {
params.code = code;
if (hasDelayRecordId) params.delayRecordId = delayRecordId;
} else {
params.code = 0;
}
try {
const { data } = await getOpenOrderExpressTrackList(params);
state.tracks = Array.isArray(data) ? data : [];
} catch (e) {
state.tracks = [];
}
return;
}
if (code === 2 && hasDelayRecordId) {
const { data } = await getExpressTrackList({
id,
@@ -124,6 +148,14 @@
async function getOrderDetail(id) {
if (!id) return;
// 开通店铺订单(type===5):详情接口 /aishop/order/get-detail-open,优先尝试
try {
const { code: rc, data } = await getOpenOrderDetail({ id });
if (rc === 0 && data && Number(data?.type) === 5) {
state.info = data;
return;
}
} catch (e) {}
try {
const { data } = await OrderApi.getOrderDetail(id);
if (data) {
@@ -139,9 +171,10 @@
} catch (e) {}
}
onLoad((options) => {
getExpressDetail(options || {});
getOrderDetail(options?.id);
onLoad(async (options) => {
// 先拿订单详情(确定 type===5,以及填充 state.info),再拿物流
await getOrderDetail(options?.id);
await getExpressDetail(options || {});
});
function handlePhoneClick(data) {
+9 -1
View File
@@ -301,7 +301,6 @@ export function getGiftOrderDetail(params: any) {
}
export const getOpenOrderDetail = getGiftOrderDetail;
// 获取开通ai店铺商品订单结算信息
export function getGiftSettlementInfo(params: any) {
return request({
url: '/aishop/order/settlement-open',
@@ -412,3 +411,12 @@ export function getAiExpressTrackList(params: { id: number | string; code: numbe
params,
})
}
// 获取开通店铺订单物流轨迹
export function getOpenOrderExpressTrackList(params: { id: number | string; code: number; delayRecordId: number | string }) {
return request({
url: '/aishop/app/open/order/get-express-track-list',
method: 'get',
params,
})
}