From 53f0736d29815584260e7c6ba5f39b7f68d4cce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=96=B5=E5=92=AA?= <15233722133@163.com> Date: Thu, 6 Aug 2026 14:52:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BB=B6=E8=BF=9F=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=AF=E9=80=89=E6=8B=A9=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/orderItem/ShipmentPopup.vue | 332 +++++++++++++++++++++---- components/orderItem/orderItem.vue | 25 +- pages/order/detail.vue | 28 ++- 3 files changed, 326 insertions(+), 59 deletions(-) diff --git a/components/orderItem/ShipmentPopup.vue b/components/orderItem/ShipmentPopup.vue index a6fbef4..b1ee056 100644 --- a/components/orderItem/ShipmentPopup.vue +++ b/components/orderItem/ShipmentPopup.vue @@ -25,7 +25,12 @@ {{ item.spuName }} {{ item.skuText || '-' }} - 最多可选 x{{ item.maxCount }} + + + 已延迟 x{{ item.alreadyDelayed }} + + 最多可选 x{{ item.maxCount }} + { }; const resolveOrderItemId = (item = {}) => - getFirstValidValue(item?.id, item?.orderItemId, item?.itemId, item?.orderGoodsId, item?.goodsId, item?.skuId); + getFirstValidValue(item?.orderItemId, item?.itemId, item?.orderGoodsId, item?.id); + +const resolveRecordItemId = (record = {}) => + getFirstValidValue(record?.orderItemId, record?.itemId, record?.orderGoodsId); + +const resolveRecordUniqueId = (record = {}) => + getFirstValidValue(record?.id, record?.delayRecordId, record?.recordId); + +const resolveRecordCount = (record = {}) => { + const candidates = [ + record?.count, + record?.delayCount, + record?.recordCount, + record?.remainingCount, + record?.availableCount, + record?.canCount, + record?.maxCount, + ]; + const matched = candidates + .map((value) => Number(value)) + .find((value) => Number.isFinite(value) && value > 0); + return matched || 0; +}; + +const isSameSku = (skuItem = {}, record = {}) => { + const skuProps = Array.isArray(skuItem?.properties) + ? skuItem.properties + : Array.isArray(skuItem?.skuProperties) + ? skuItem.skuProperties + : Array.isArray(skuItem?.attrs) + ? skuItem.attrs + : Array.isArray(skuItem?.specs) + ? skuItem.specs + : Array.isArray(skuItem?.specifications) + ? skuItem.specifications + : []; + const recordProps = Array.isArray(record?.properties) + ? record.properties + : Array.isArray(record?.skuProperties) + ? record.skuProperties + : Array.isArray(record?.attrs) + ? record.attrs + : Array.isArray(record?.specs) + ? record.specs + : Array.isArray(record?.specifications) + ? record.specifications + : []; + if (skuProps.length && recordProps.length && skuProps.length === recordProps.length) { + const skuKey = skuProps + .map((p) => `${getFirstValidValue(p?.valueName, p?.value, p?.specValue, p?.attrValue, p?.optionValue, p?.propertyValue)}`) + .filter(Boolean) + .join('|'); + const recKey = recordProps + .map((p) => `${getFirstValidValue(p?.valueName, p?.value, p?.specValue, p?.attrValue, p?.optionValue, p?.propertyValue)}`) + .filter(Boolean) + .join('|'); + if (skuKey && recKey) return skuKey === recKey; + if (skuKey || recKey) return false; + } else if (skuProps.length || recordProps.length) { + return false; + } + const skuText = getFirstValidValue( + skuItem?.skuText, + skuItem?.specText, + skuItem?.propertiesText, + skuItem?.skuDesc, + skuItem?.specDesc, + skuItem?.specification, + formatSkuProperties(skuItem?.properties), + formatSkuProperties(skuItem?.skuProperties), + formatSkuProperties(skuItem?.attrs), + ); + const recText = getFirstValidValue( + record?.skuText, + record?.specText, + record?.propertiesText, + formatSkuProperties(record?.properties), + formatSkuProperties(record?.skuProperties), + formatSkuProperties(record?.attrs), + formatSkuProperties(record?.specs), + formatSkuProperties(record?.specifications), + record?.skuDesc, + record?.specDesc, + record?.specification, + record?.propertiesValue, + record?.skuValue, + record?.sku, + record?.specInfo, + record?.attrText, + ); + if (skuText && recText) return skuText === recText; + if (skuText || recText) return false; + return false; +}; const resolveDelayItemCount = (item = {}) => { const candidates = [ @@ -147,6 +245,11 @@ const resolveDelayItemCount = (item = {}) => { item?.availableCount, item?.canCount, item?.maxCount, + item?.goodsCount, + item?.productCount, + item?.num, + item?.number, + item?.quantity, ]; const matched = candidates .map((value) => Number(value)) @@ -154,6 +257,93 @@ const resolveDelayItemCount = (item = {}) => { return matched || 0; }; +const buildAlreadyDelayedCountForSpu = (spuItem = {}, parentSpu = {}, delayRecordsInput) => { + const skuItems = Array.isArray(spuItem?.items) && spuItem.items.length > 0 ? spuItem.items : [spuItem]; + const targetSpuId = getFirstValidValue( + spuItem?.spuId, + spuItem?.productId, + spuItem?.goodsId, + parentSpu?.spuId, + parentSpu?.productId, + parentSpu?.goodsId, + ); + const targetSpuName = getFirstValidValue( + spuItem?.spuName, + spuItem?.name, + spuItem?.goodsName, + spuItem?.productName, + parentSpu?.spuName, + parentSpu?.name, + parentSpu?.goodsName, + parentSpu?.productName, + ); + const matchSpuIdentity = (record) => { + const recordSpuId = getFirstValidValue(record?.spuId, record?.productId, record?.goodsId); + if (targetSpuId && recordSpuId) return String(targetSpuId) === String(recordSpuId); + const recordSpuName = getFirstValidValue(record?.spuName, record?.name, record?.goodsName, record?.productName); + if (targetSpuName && recordSpuName) return String(targetSpuName).trim() === String(recordSpuName).trim(); + return false; + }; + const records = (Array.isArray(delayRecordsInput) && delayRecordsInput.length > 0 ? delayRecordsInput : []).filter((r) => { + if (!r) return false; + const status = Number(r?.status); + if (status !== 1) return false; + if (!matchSpuIdentity(r)) return false; + const c = resolveRecordCount(r); + return c > 0; + }); + if (!records.length || !skuItems.length) { + const empty = new Map(); + skuItems.forEach((_, i) => empty.set(resolveOrderItemId(skuItems[i]) || `sku-${i}`, 0)); + return empty; + } + const skuCountMap = new Map(); + skuItems.forEach((skuItem, idx) => { + const key = resolveOrderItemId(skuItem) || `sku-${idx}`; + skuCountMap.set(key, 0); + }); + const usedRecordKeys = new Set(); + const addRecordCountToSku = (record, skuItem, skuIdx) => { + const rKey = resolveRecordUniqueId(record) || JSON.stringify(record); + if (usedRecordKeys.has(rKey)) return false; + const skuKey = resolveOrderItemId(skuItem) || `sku-${skuIdx}`; + if (!skuCountMap.has(skuKey)) skuCountMap.set(skuKey, 0); + const c = resolveRecordCount(record); + skuCountMap.set(skuKey, (Number(skuCountMap.get(skuKey)) || 0) + c); + usedRecordKeys.add(rKey); + return true; + }; + records.forEach((record) => { + const recordItemId = resolveRecordItemId(record); + if (!recordItemId) return; + const matchedIdx = skuItems.findIndex((skuItem) => { + const skuItemId = resolveOrderItemId(skuItem); + return skuItemId && String(skuItemId) === String(recordItemId); + }); + if (matchedIdx >= 0) addRecordCountToSku(record, skuItems[matchedIdx], matchedIdx); + }); + records.forEach((record) => { + const rKey = resolveRecordUniqueId(record) || JSON.stringify(record); + if (usedRecordKeys.has(rKey)) return; + const matchedIdx = skuItems.findIndex((skuItem) => isSameSku(skuItem, record)); + if (matchedIdx >= 0) addRecordCountToSku(record, skuItems[matchedIdx], matchedIdx); + }); + records.forEach((record) => { + const rKey = resolveRecordUniqueId(record) || JSON.stringify(record); + if (usedRecordKeys.has(rKey)) return; + if (skuItems.length === 1 && matchSpuIdentity(record)) { + addRecordCountToSku(record, skuItems[0], 0); + } + }); + return skuCountMap; +}; + +const getSkuAlreadyDelayedCount = (skuCountMap, skuItem, skuIdx) => { + if (!skuCountMap || skuCountMap.size === 0) return 0; + const key = resolveOrderItemId(skuItem) || `sku-${skuIdx}`; + return Number(skuCountMap.get(key)) || 0; +}; + const resolveDelayRecordId = (item = {}) => getFirstValidValue(item?.delayRecordId, item?.recordId, item?.id); @@ -173,50 +363,89 @@ const resolveDelayRecordCount = (item = {}) => { return matched || 0; }; -const createDelayShipmentItem = (item, parentItem = {}) => { - const maxCount = resolveDelayItemCount(item); - const orderItemId = resolveOrderItemId(item); - const parentOrderItemId = resolveOrderItemId(parentItem); - const submitOrderItemId = getFirstValidValue(orderItemId, parentOrderItemId); - const skuText = getFirstValidValue( - formatSkuProperties(item?.properties || parentItem?.properties), - formatSkuProperties(item?.skuProperties || parentItem?.skuProperties), - formatSkuProperties(item?.attrs || parentItem?.attrs), - formatSkuProperties(item?.specs || parentItem?.specs), - formatSkuProperties(item?.specifications || parentItem?.specifications), - getFirstValidValue(item?.skuText, parentItem?.skuText), - getFirstValidValue(item?.specText, parentItem?.specText), - getFirstValidValue(item?.propertiesText, parentItem?.propertiesText), - getFirstValidValue(item?.skuDesc, parentItem?.skuDesc), - getFirstValidValue(item?.specDesc, parentItem?.specDesc), - ); - return { - itemKey: getFirstValidValue( - 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 delayRecordsInput = Array.isArray(props.delayRecords) ? props.delayRecords : []; + const results = []; + sourceItems.forEach((spuItem) => { + const hasNested = Array.isArray(spuItem?.items) && spuItem.items.length > 0; + const skuCountMap = buildAlreadyDelayedCountForSpu(spuItem, spuItem, delayRecordsInput); + if (hasNested) { + spuItem.items.forEach((skuItem, idx) => { + if (!skuItem) return; + const totalCount = resolveDelayItemCount(skuItem); + const alreadyDelayed = getSkuAlreadyDelayedCount(skuCountMap, skuItem, idx); + const remaining = Math.max(0, Number(totalCount) - Number(alreadyDelayed)); + const maxCount = remaining; + if (maxCount <= 0) return; + const orderItemId = resolveOrderItemId(skuItem); + const parentOrderItemId = resolveOrderItemId(spuItem); + const submitOrderItemId = getFirstValidValue(orderItemId, parentOrderItemId); + const skuText = getFirstValidValue( + formatSkuProperties(skuItem?.properties || spuItem?.properties), + formatSkuProperties(skuItem?.skuProperties || spuItem?.skuProperties), + formatSkuProperties(skuItem?.attrs || spuItem?.attrs), + formatSkuProperties(skuItem?.specs || spuItem?.specs), + formatSkuProperties(skuItem?.specifications || spuItem?.specifications), + getFirstValidValue(skuItem?.skuText, spuItem?.skuText), + getFirstValidValue(skuItem?.specText, spuItem?.specText), + getFirstValidValue(skuItem?.propertiesText, spuItem?.propertiesText), + getFirstValidValue(skuItem?.skuDesc, spuItem?.skuDesc), + getFirstValidValue(skuItem?.specDesc, spuItem?.specDesc), + ); + results.push({ + itemKey: getFirstValidValue( + submitOrderItemId, + `${skuItem?.spuName || skuItem?.name || spuItem?.spuName || spuItem?.name || ''}_${skuText}_${totalCount}_${alreadyDelayed}`, + ), + orderItemId, + parentOrderItemId, + submitOrderItemId, + picUrl: skuItem?.picUrl || spuItem?.picUrl || '', + spuName: skuItem?.spuName || skuItem?.name || spuItem?.spuName || spuItem?.name || '', + skuText, + totalCount, + alreadyDelayed, + maxCount, + selectedCount: maxCount, + }); + }); + } else { + const totalCount = resolveDelayItemCount(spuItem); + const alreadyDelayed = getSkuAlreadyDelayedCount(skuCountMap, spuItem, 0); + const remaining = Math.max(0, Number(totalCount) - Number(alreadyDelayed)); + const maxCount = remaining; + if (maxCount <= 0) return; + const orderItemId = resolveOrderItemId(spuItem); + const submitOrderItemId = orderItemId; + const skuText = getFirstValidValue( + formatSkuProperties(spuItem?.properties), + formatSkuProperties(spuItem?.skuProperties), + formatSkuProperties(spuItem?.attrs), + formatSkuProperties(spuItem?.specs), + formatSkuProperties(spuItem?.specifications), + getFirstValidValue(spuItem?.skuText, spuItem?.specText, spuItem?.propertiesText), + getFirstValidValue(spuItem?.skuDesc, spuItem?.specDesc), + ); + results.push({ + itemKey: getFirstValidValue( + submitOrderItemId, + `${spuItem?.spuName || spuItem?.name || ''}_${skuText}_${totalCount}_${alreadyDelayed}`, + ), + orderItemId, + parentOrderItemId: orderItemId, + submitOrderItemId, + picUrl: spuItem?.picUrl || '', + spuName: spuItem?.spuName || spuItem?.name || '', + skuText, + totalCount, + alreadyDelayed, + maxCount, + selectedCount: maxCount, + }); + } + }); + return results; }; const createNowShipmentItem = (item) => { @@ -480,6 +709,21 @@ defineExpose({ .shipment-popup__item-count { font-size: 24rpx; color: #666666; + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 8rpx; +} + +.shipment-popup__item-delayed { + color: #FA7E31; + background: #FFF4EC; + padding: 4rpx 12rpx; + border-radius: 8rpx; +} + +.shipment-popup__item-remain { + color: #666666; } .shipment-popup__actions { diff --git a/components/orderItem/orderItem.vue b/components/orderItem/orderItem.vue index 286181e..655ae7c 100644 --- a/components/orderItem/orderItem.vue +++ b/components/orderItem/orderItem.vue @@ -108,6 +108,7 @@ :order-no="props.data.no || ''" :order-time="formatCreateTime(props.data.createTime) || ''" :order-data="props.data" + :delay-records="state.delayRecords" @close="closeDelayShipmentPopup" @submit="handleDelayShipmentSubmit" /> @@ -247,25 +248,13 @@ } }; - watch( - () => resolveAiOrderId(props.data), - (value) => { - if (!value) return; - state.delayRecordsLoaded = false; - loadDelayRecords(true); - }, - { immediate: false }, - ); - onMounted(() => { - loadDelayRecords(); - }); const nowShipmentPopupRef = ref(); const delayShipmentPopupRef = ref(); const closeNowShipmentPopup = () => {}; const closeDelayShipmentPopup = () => {}; - const openDelayShipmentPopup = (data) => { + const openDelayShipmentPopup = async (data) => { const id = resolveAiOrderId(data); if (!id) { uni.showToast({ @@ -274,9 +263,13 @@ }); return; } + try { + await loadDelayRecords(true); + } catch (e) { + } delayShipmentPopupRef.value?.open(); }; - const openNowShipmentPopup = (data) => { + const openNowShipmentPopup = async (data) => { const id = resolveAiOrderId(data); if (!id) { uni.showToast({ @@ -285,6 +278,10 @@ }); return; } + try { + await loadDelayRecords(true); + } catch (e) { + } nowShipmentPopupRef.value?.open(); }; const handleDelayShipmentSubmit = async ({ items, close }) => { diff --git a/pages/order/detail.vue b/pages/order/detail.vue index c9d7467..1f8688f 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -137,6 +137,7 @@ :order-no="state.orderInfo.no || ''" :order-time="formatCreateTime(state.orderInfo.createTime) || ''" :order-data="state.orderInfo" + :delay-records="state.delayRecords" @close="closeDelayShipmentPopup" @submit="handleDelayShipmentSubmit" /> @@ -248,7 +249,28 @@ const closeDelayShipmentPopup = () => {}; const closeNowShipmentPopup = () => {}; - const openDelayShipmentPopup = () => { + const reloadDelayRecords = async () => { + if (!isAiStoreOrder.value) { + state.delayRecords = []; + return; + } + const orderId = resolveAiOrderId(state.orderInfo); + if (!orderId) { + state.delayRecords = []; + return; + } + try { + const delayRes = await getAiOrderDelayRecords({ orderId }); + if (delayRes.code === 0 && Array.isArray(delayRes.data)) { + state.delayRecords = delayRes.data; + return; + } + } catch (e) { + } + state.delayRecords = []; + }; + + const openDelayShipmentPopup = async () => { const id = resolveAiOrderId(state.orderInfo); if (!id) { uni.showToast({ @@ -257,6 +279,10 @@ }); return; } + try { + await reloadDelayRecords(); + } catch (e) { + } delayShipmentPopupRef.value?.open(); }; const openNowShipmentPopup = () => {