feat: 延迟发货调试

This commit is contained in:
2026-08-06 13:21:17 +08:00
parent 160a72b015
commit a37ea9cb8e
6 changed files with 1351 additions and 343 deletions
+17
View File
@@ -41,6 +41,8 @@
class="order-goods"
v-if="state?.orderInfo?.items?.length > 0"
:data="state.orderInfo"
source="aishop"
:delay-records="state.delayRecords"
type="4"
@getOrderDetail="getOrderDetail"
></card_order>
@@ -151,6 +153,7 @@
orderInfo: {},
merchantTradeNo: '', // 商户订单号
comeinType: '', // 进入订单详情的来源类型
delayRecords: [],
});
let statusObj = ref({
0: {
@@ -223,6 +226,20 @@
if (state.orderInfo.deliveryType === 2 && state.orderInfo.payStatus) {
pickUpVerifyRef.value && pickUpVerifyRef.value.markCode(res.data.pickUpVerifyCode);
}
if (orderId.value) {
try {
const delayRes = await OrderApi.getAiOrderDelayRecords({ orderId: orderId.value });
if (delayRes.code === 0 && Array.isArray(delayRes.data)) {
state.delayRecords = delayRes.data;
} else {
state.delayRecords = [];
}
} catch (e) {
state.delayRecords = [];
}
} else {
state.delayRecords = [];
}
} else {
}
}
+100 -156
View File
@@ -27,6 +27,7 @@
v-if="state?.orderInfo?.items?.length > 0"
:data="state.orderInfo"
:source="state.source"
:delay-records="state.delayRecords"
type="2"
theme="2"
@getOrderDetail="getOrderDetail"
@@ -108,54 +109,27 @@
<card_orderBan v-else :data="state.orderInfo" @downData="getOrderDetail" type="2"></card_orderBan>
</view>
</su-fixed>
<uni-popup ref="delayPopupRef" type="center" background-color="transparent">
<view class="delay-popup" @tap.stop>
<view class="delay-popup__header">
<view>
<view class="delay-popup__title">延迟发货</view>
<view class="delay-popup__order-no">订单号:{{ state.orderInfo.no || '-' }}</view>
<view class="delay-popup__order-time">
下单时间:{{ formatCreateTime(state.orderInfo.createTime) || '-' }}
</view>
</view>
<view class="delay-popup__close" @tap.stop="closeDelayShipmentPopup">×</view>
</view>
<view class="delay-popup__desc">请选择当前商品及延迟发货数量</view>
<scroll-view scroll-y class="delay-popup__content">
<view
class="delay-popup__item"
v-for="(item, index) in delayShipmentItems"
:key="item.itemKey || index"
>
<image class="delay-popup__item-image" :src="item.picUrl" mode="aspectFill" />
<view class="delay-popup__item-main">
<view class="delay-popup__item-name lineTwo">{{ item.spuName }}</view>
<view class="delay-popup__item-sku">{{ item.skuText || '-' }}</view>
<view class="delay-popup__item-footer flex-center ju-between">
<view class="delay-popup__item-count">最多可选 x{{ item.maxCount }}</view>
<su-number-box
v-model="item.selectedCount"
:min="0"
:max="item.maxCount"
:step="1"
background="#F6F7FB"
color="#333333"
@change="onDelayShipmentCountChange(index, $event)"
/>
</view>
</view>
</view>
</scroll-view>
<view class="delay-popup__actions">
<view class="delay-popup__btn delay-popup__btn--ghost" @tap.stop="closeDelayShipmentPopup">
取消
</view>
<view class="delay-popup__btn delay-popup__btn--primary" @tap.stop="submitDelayShipment">
确认延迟发货
</view>
</view>
</view>
</uni-popup>
<ShipmentPopup
ref="nowShipmentPopupRef"
mode="now"
popup-type="center"
:order-no="state.orderInfo.no || ''"
:order-time="formatCreateTime(state.orderInfo.createTime) || ''"
:order-data="state.orderInfo"
:delay-records="state.delayRecords"
@close="closeNowShipmentPopup"
@submit="handleNowShipmentSubmit"
/>
<ShipmentPopup
ref="delayShipmentPopupRef"
mode="delay"
popup-type="center"
:order-no="state.orderInfo.no || ''"
:order-time="formatCreateTime(state.orderInfo.createTime) || ''"
:order-data="state.orderInfo"
@close="closeDelayShipmentPopup"
@submit="handleDelayShipmentSubmit"
/>
</s-pages>
</template>
@@ -175,10 +149,12 @@
giftConfirmReceive,
getOrderDetail as getAiOrderDetail,
getOpenOrderDetail,
getAiOrderDelayRecords,
} from '@/sheep/api/ai';
import StoreApi from '@/sheep/api/trade/store';
import card_order from '@/components/orderItem/card_order.vue';
import AiOrderActionBar from '@/components/orderItem/AiOrderActionBar.vue';
import ShipmentPopup from '@/components/orderItem/ShipmentPopup.vue';
import truckLine from '@/components/truckLine/truckLine.vue'
import PickUpVerify from '@/pages/order/pickUpVerify.vue';
@@ -190,6 +166,7 @@
comeinType: '', // 进入订单详情的来源类型
orderType: '',
source: '',
delayRecords: [],
});
@@ -255,91 +232,14 @@
const resolveAiOrderId = (data) => {
return data?.id || data?.orderId;
};
const getDelayFirstValidValue = (...values) =>
values.find((value) => value !== undefined && value !== null && String(value).trim() !== '') ?? '';
const resolveDelayOrderItemId = (item = {}) => {
return getDelayFirstValidValue(
item?.id,
item?.orderItemId,
item?.itemId,
item?.orderGoodsId,
item?.goodsId,
item?.skuId,
);
};
const hasDelayOrderItemId = (value) =>
value !== undefined && value !== null && String(value).trim() !== '';
const resolveDelayMaxCount = (item = {}) => {
const candidates = [
item?.count,
item?.remainingCount,
item?.availableCount,
item?.canCount,
item?.maxCount,
];
const matched = candidates
.map((value) => Number(value))
.find((value) => Number.isFinite(value) && value > 0);
return matched || 0;
};
const formatSkuProperties = (properties) => {
const list = Array.isArray(properties) ? properties : [];
return list
.map((property) => property?.valueName)
.filter(Boolean)
.join(' ');
};
const isAiStoreOrder = computed(() => {
return String(state.source) === 'aishop' || String(state.orderInfo?.__source) === 'aishop';
});
const delayPopupRef = ref();
const delayShipmentItems = ref([]);
const createDelayShipmentItem = (item, parentItem = {}) => {
const maxCount = resolveDelayMaxCount(item);
const orderItemId = resolveDelayOrderItemId(item);
const parentOrderItemId = resolveDelayOrderItemId(parentItem);
const submitOrderItemId = getDelayFirstValidValue(orderItemId, parentOrderItemId);
const skuText = formatSkuProperties(item?.properties || parentItem?.properties);
return {
itemKey: getDelayFirstValidValue(
submitOrderItemId,
`${item?.spuName || item?.name || parentItem?.spuName || parentItem?.name || ''}_${skuText}_${maxCount}`,
),
orderItemId,
parentOrderItemId,
submitOrderItemId,
picUrl: item?.picUrl || parentItem?.picUrl || '',
spuName: item?.spuName || item?.name || parentItem?.spuName || parentItem?.name || '',
skuText,
maxCount,
selectedCount: maxCount,
};
};
const createDelayShipmentItems = (data) => {
const sourceItems = Array.isArray(data?.items) ? data.items : [];
return sourceItems
.flatMap((item) => {
const children = Array.isArray(item?.items) ? item.items : [];
if (children.length) {
return children.filter(Boolean).map((child) => createDelayShipmentItem(child, item));
}
return [createDelayShipmentItem(item, item)];
})
.filter((item) => item.maxCount > 0);
};
const closeDelayShipmentPopup = () => {
delayPopupRef.value?.close();
};
const onDelayShipmentCountChange = (index, value) => {
const current = delayShipmentItems.value[index];
if (!current) return;
const next = Number(value);
if (!Number.isFinite(next)) {
current.selectedCount = 0;
return;
}
current.selectedCount = Math.min(current.maxCount, Math.max(0, next));
};
const delayShipmentPopupRef = ref();
const nowShipmentPopupRef = ref();
const closeDelayShipmentPopup = () => {};
const closeNowShipmentPopup = () => {};
const openDelayShipmentPopup = () => {
const id = resolveAiOrderId(state.orderInfo);
if (!id) {
@@ -349,36 +249,23 @@
});
return;
}
const nextItems = createDelayShipmentItems(state.orderInfo);
if (!nextItems.length) {
return;
}
delayShipmentItems.value = nextItems;
delayPopupRef.value?.open();
delayShipmentPopupRef.value?.open();
};
const submitDelayShipment = async () => {
const orderId = resolveAiOrderId(state.orderInfo);
if (!orderId) {
const openNowShipmentPopup = () => {
const id = resolveAiOrderId(state.orderInfo);
if (!id) {
uni.showToast({
title: '订单信息异常',
icon: 'none',
});
return;
}
const hasSelectedCount = delayShipmentItems.value.some((item) => Number(item.selectedCount) > 0);
const items = delayShipmentItems.value
.filter(
(item) => Number(item.selectedCount) > 0 && hasDelayOrderItemId(item.submitOrderItemId),
)
.map((item) => ({
orderItemId: item.submitOrderItemId,
count: Number(item.selectedCount),
}));
if (!items.length) {
uni.showToast({
title: hasSelectedCount ? '订单商品信息异常' : '请选择延迟发货数量',
icon: 'none',
});
nowShipmentPopupRef.value?.open();
};
const handleDelayShipmentSubmit = async ({ items, close }) => {
const orderId = resolveAiOrderId(state.orderInfo);
if (!orderId || !Array.isArray(items) || items.length === 0) {
return;
}
const { code } = await aiDelayedShipment({
@@ -386,13 +273,33 @@
items,
});
if (code === 0) {
closeDelayShipmentPopup();
close?.();
getOrderDetail();
}
};
const handleNowShipmentSubmit = async ({ items, close }) => {
const orderId = resolveAiOrderId(state.orderInfo);
if (!orderId || !Array.isArray(items) || items.length === 0) {
return;
}
const { code } = await aiPendingShipment({
orderId,
items,
});
if (code === 0) {
close?.();
getOrderDetail();
}
};
function delayShipment() {
if (isPickUpOrder.value) return;
if (isPickUpOrder.value) {
uni.showToast({
title: '自提订单不支持延迟发货',
icon: 'none',
});
return;
}
if (isAiStoreOrder.value) {
openDelayShipmentPopup();
return;
@@ -423,7 +330,17 @@
}
function nowShipment() {
if (isPickUpOrder.value) return;
if (isPickUpOrder.value) {
uni.showToast({
title: '自提订单不支持立即发货',
icon: 'none',
});
return;
}
if (isAiStoreOrder.value) {
openNowShipmentPopup();
return;
}
const id = resolveAiOrderId(state.orderInfo);
if (!id) {
uni.showToast({
@@ -510,6 +427,26 @@
if (state.orderInfo.deliveryType === 2 && state.orderInfo.payStatus) {
pickUpVerifyRef.value && pickUpVerifyRef.value.markCode(res.data.pickUpVerifyCode);
}
// 店铺订单:延迟记录独立拉取
if (isAiStoreOrder.value) {
const orderId = resolveAiOrderId(state.orderInfo);
if (orderId) {
try {
const delayRes = await getAiOrderDelayRecords({ orderId });
if (delayRes.code === 0 && Array.isArray(delayRes.data)) {
state.delayRecords = delayRes.data;
} else {
state.delayRecords = [];
}
} catch (e) {
state.delayRecords = [];
}
} else {
state.delayRecords = [];
}
} else {
state.delayRecords = [];
}
} else {
sheep.$router.back();
}
@@ -955,4 +892,11 @@
background: linear-gradient(135deg, #fa8735 0%, #fe3b48 100%);
color: #ffffff;
}
.now-shipment-empty {
padding: 40rpx 24rpx;
text-align: center;
font-size: 26rpx;
color: #999999;
}
</style>