From 7580b8cf28a7d2fd64f166eb04a58ad9d1d65a79 Mon Sep 17 00:00:00 2001
From: Jarrett <616766585@qq.com>
Date: Wed, 28 Jan 2026 08:59:50 +0800
Subject: [PATCH] =?UTF-8?q?modify(mall):=20=E8=87=AA=E6=8F=90=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=A0=B8=E9=94=80=E6=A0=A1=E9=AA=8C=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=AF=E5=BE=85=E6=A0=B8=E9=94=80=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iocoder/yudao/module/trade/enums/ErrorCodeConstants.java   | 1 +
 .../trade/service/order/TradeOrderUpdateServiceImpl.java       | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
index 8ec1159244..2ab259a57f 100644
--- a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
@@ -41,6 +41,7 @@ public interface ErrorCodeConstants {
     ErrorCode ORDER_PICK_UP_FAIL_NOT_VERIFY_USER = new ErrorCode(1_011_000_036, "交易订单自提失败，原因：你没有核销该门店订单的权限");
     ErrorCode ORDER_PICK_UP_FAIL_COMBINATION_NOT_SUCCESS = new ErrorCode(1_011_000_037, "交易订单自提失败，原因：商品拼团记录不是【成功】状态");
     ErrorCode ORDER_CREATE_FAIL_INSUFFICIENT_USER_POINTS = new ErrorCode(1_011_000_038, "交易订单创建失败，原因：用户积分不足");
+    ErrorCode ORDER_PICK_UP_FAIL_STATUS_NOT_UNDELIVERED = new ErrorCode(1_011_000_039, "交易订单自提失败，订单不是【待核销】状态");
 
     // ========== After Sale 模块 1-011-000-100 ==========
     ErrorCode AFTER_SALE_NOT_FOUND = new ErrorCode(1_011_000_100, "售后单不存在");
diff --git a/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java b/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
index 690f3de52c..9cbeccf6a5 100644
--- a/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
@@ -780,6 +780,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         if (ObjUtil.notEqual(DeliveryTypeEnum.PICK_UP.getType(), order.getDeliveryType())) {
             throw exception(ORDER_RECEIVE_FAIL_DELIVERY_TYPE_NOT_PICK_UP);
         }
+        if (!TradeOrderStatusEnum.isUndelivered(order.getStatus())) {
+            throw exception(ORDER_PICK_UP_FAIL_STATUS_NOT_UNDELIVERED);
+        }
         // 情况一：如果是拼团订单，则校验拼团是否成功
         if (TradeOrderTypeEnum.isCombination(order.getType())) {
             CombinationRecordRespDTO combinationRecord = combinationRecordApi.getCombinationRecordByOrderId(