From 955a3c8c6d420de3b2a93f1719b3946723632307 Mon Sep 17 00:00:00 2001
From: zzh <1368735060@qq.com>
Date: Tue, 29 Sep 2026 19:56:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8F=BD=E6=94=B6=E6=8E=A8=E8=B4=B9?=
 =?UTF-8?q?=E6=8C=89=E6=89=BF=E8=BF=90=E8=BF=90=E5=8D=95=E5=8F=B7=20Carrie?=
 =?UTF-8?q?rWaybillNo=20=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/Oms.Application/Dtos/Orders/PickupOrderDtos.cs     |  3 +++
 .../Services/Orders/PickupOrderFeePushService.cs       | 10 +++++-----
 .../Repositories/IPickupOrderRepository.cs             |  2 ++
 src/Oms.SqlSugarCore/Orders/PickupOrderRepository.cs   |  6 ++++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/Oms.Application/Dtos/Orders/PickupOrderDtos.cs b/src/Oms.Application/Dtos/Orders/PickupOrderDtos.cs
index b046a71..8828139 100644
--- a/src/Oms.Application/Dtos/Orders/PickupOrderDtos.cs
+++ b/src/Oms.Application/Dtos/Orders/PickupOrderDtos.cs
@@ -388,6 +388,9 @@ public class PickupOpenApiPushFeeResult
 
 public class PickupOpenApiPushFeeInput
 {
+    /// <summary>
+    /// 承运运单号，对应库字段 CarrierWaybillNo。
+    /// </summary>
     public string? WaybillNumber { get; set; }
 
     public decimal ActualWeight { get; set; }
diff --git a/src/Oms.Application/Services/Orders/PickupOrderFeePushService.cs b/src/Oms.Application/Services/Orders/PickupOrderFeePushService.cs
index 73dbafa..b1442c0 100644
--- a/src/Oms.Application/Services/Orders/PickupOrderFeePushService.cs
+++ b/src/Oms.Application/Services/Orders/PickupOrderFeePushService.cs
@@ -70,10 +70,10 @@ public class PickupOrderFeePushService : IScopedDependency
             throw new BusinessException("请求体不能为空");
         }
 
-        var pickupNo = (input.WaybillNumber ?? string.Empty).Trim();
-        if (string.IsNullOrWhiteSpace(pickupNo))
+        var carrierWaybillNo = (input.WaybillNumber ?? string.Empty).Trim();
+        if (string.IsNullOrWhiteSpace(carrierWaybillNo))
         {
-            throw new BusinessException("waybillNumber 不能为空");
+            throw new BusinessException("waybillNumber（承运运单号 CarrierWaybillNo）不能为空");
         }
 
         if (input.ActualWeight <= 0)
@@ -87,8 +87,8 @@ public class PickupOrderFeePushService : IScopedDependency
             throw new BusinessException("goodsSizeList 不能为空");
         }
 
-        var pickup = await _pickupOrderRepository.GetByPickupNoAsync(pickupNo)
-            ?? throw new BusinessException("揽收单不存在");
+        var pickup = await _pickupOrderRepository.GetByCarrierWaybillNoAsync(carrierWaybillNo)
+            ?? throw new BusinessException($"揽收单不存在：承运运单号 {carrierWaybillNo}");
 
         await EnsureAppKeyAsync(key, pickup);
 
diff --git a/src/Oms.Domain/OrdersAggregate/Repositories/IPickupOrderRepository.cs b/src/Oms.Domain/OrdersAggregate/Repositories/IPickupOrderRepository.cs
index 55b9cc8..92ef693 100644
--- a/src/Oms.Domain/OrdersAggregate/Repositories/IPickupOrderRepository.cs
+++ b/src/Oms.Domain/OrdersAggregate/Repositories/IPickupOrderRepository.cs
@@ -7,6 +7,8 @@ public interface IPickupOrderRepository : IRepository<PickupOrder>
 {
     Task<PickupOrder?> GetByPickupNoAsync(string pickupNo, CancellationToken cancellationToken = default);
 
+    Task<PickupOrder?> GetByCarrierWaybillNoAsync(string carrierWaybillNo, CancellationToken cancellationToken = default);
+
     Task<PickupOrder?> GetOwnedAsync(int id, int customerId, CancellationToken cancellationToken = default);
 
     Task<PickupWorkplaceCountRow> GetWorkplaceCountsAsync(
diff --git a/src/Oms.SqlSugarCore/Orders/PickupOrderRepository.cs b/src/Oms.SqlSugarCore/Orders/PickupOrderRepository.cs
index a898e0b..c9a19ca 100644
--- a/src/Oms.SqlSugarCore/Orders/PickupOrderRepository.cs
+++ b/src/Oms.SqlSugarCore/Orders/PickupOrderRepository.cs
@@ -14,6 +14,12 @@ public class PickupOrderRepository : OmsSqlSugarRepository<PickupOrder>, IPickup
         return FirstOrDefaultAsync(x => x.PickupNo == no, cancellationToken);
     }
 
+    public Task<PickupOrder?> GetByCarrierWaybillNoAsync(string carrierWaybillNo, CancellationToken cancellationToken = default)
+    {
+        var no = carrierWaybillNo.Trim();
+        return FirstOrDefaultAsync(x => x.CarrierWaybillNo == no, cancellationToken);
+    }
+
     public Task<PickupOrder?> GetOwnedAsync(int id, int customerId, CancellationToken cancellationToken = default)
     {
         return FirstOrDefaultAsync(x => x.Id == id && x.CustomerId == customerId, cancellationToken);