From c6b01def4c14d8fc93280c9a90b4095421990af6 Mon Sep 17 00:00:00 2001 From: jacy <18049821889@163.com> Date: Wed, 2 Sep 2026 17:20:40 +0800 Subject: [PATCH] =?UTF-8?q?feat(trade):=20v4.0.13=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=A6=81=E5=85=A8=E5=B8=82=E4=B8=8E=E5=B0=8F=E9=A3=9E=E4=BE=A0?= =?UTF-8?q?=E6=8B=92=E5=8D=95=E5=8F=AF=E6=84=9F=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 拦截伪区县写入与下单;推单失败挂 fulfillmentHold,HQ 可见超区/推单失败。 Co-authored-by: Cursor --- apps/admin-web/src/pages/OrdersPage.tsx | 24 ++++- apps/h5-partner/src/pages/ProxyOrderPage.tsx | 8 ++ .../mini-user/src/components/RegionPicker.tsx | 68 ++++++++++--- apps/mini-user/src/lib/region-data.ts | 35 +++++++ apps/mini-user/src/lib/shipping-address.ts | 61 ++++++++++++ .../src/pages/address-edit/index.tsx | 39 +++++--- apps/mini-user/src/pages/addresses/index.tsx | 97 +++++++++++-------- .../src/pages/order-confirm/index.tsx | 16 ++- apps/mini-user/src/styles/address.css | 28 ++++++ docs/杜康好客-v4-现状对照.md | 4 +- docs/杜康好客-v4.0.13-开发文档.md | 93 ++++++++++++++++++ packages/domain/src/index.ts | 1 + packages/domain/src/shipping-address.test.ts | 50 ++++++++++ packages/domain/src/shipping-address.ts | 75 ++++++++++++++ packages/shared-types/src/trade.ts | 7 +- .../fulfillment/fulfillment.service.ts | 25 ++++- .../src/modules/iam/user-address.service.ts | 22 ++++- .../src/modules/trade/trade.service.ts | 36 +++++++ 18 files changed, 613 insertions(+), 76 deletions(-) create mode 100644 apps/mini-user/src/lib/shipping-address.ts create mode 100644 docs/杜康好客-v4.0.13-开发文档.md create mode 100644 packages/domain/src/shipping-address.test.ts create mode 100644 packages/domain/src/shipping-address.ts diff --git a/apps/admin-web/src/pages/OrdersPage.tsx b/apps/admin-web/src/pages/OrdersPage.tsx index fbf7de5..2254ee8 100644 --- a/apps/admin-web/src/pages/OrdersPage.tsx +++ b/apps/admin-web/src/pages/OrdersPage.tsx @@ -721,7 +721,15 @@ export default function OrdersPage() { render: (_, row) => ( {row.productName || '—'} - {row.fulfillmentHold ? 大单 : null} + {row.fulfillmentHold ? ( + + {row.fulfillmentHoldReason === 'LARGE_ORDER_GE_10_BOXES' + ? '大单' + : row.fulfillmentHoldReason === 'COURIER_OUT_OF_SERVICE' + ? '超区' + : '推单失败'} + + ) : null} {row.orderType === 'PROXY' || row.isProxyOrder ? ( 代下单 ) : null} @@ -1023,7 +1031,7 @@ export default function OrdersPage() { ) : } - 大单拦截 + 履约拦截