From ee34bbec89d1b75a2bad85325190dec71aadd1b5 Mon Sep 17 00:00:00 2001
From: zyh <zyyhdxg@qq.com>
Date: Thu, 24 Oct 2024 17:09:38 +0800
Subject: [PATCH] 123

---
 app/store/service/order/Delivery.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/store/service/order/Delivery.php b/app/store/service/order/Delivery.php
index 860f368e..e9da5a43 100644
--- a/app/store/service/order/Delivery.php
+++ b/app/store/service/order/Delivery.php
@@ -50,11 +50,12 @@ class Delivery extends BaseService
      */
     public function delivery(int $orderId, array $param): bool
     {
-        if(empty($param['expressId'] && $param['delivery']!=20)) {
+
+        if($param['deliveryMethod'] == self::DELIVERY_METHOD_MANUAL && empty($param['expressId'])) {
             $this->error = '物流公司不能为空';
             return false;
         }
-        if (empty($param['expressNo'] && $param['delivery']!=20)) {
+        if ($param['deliveryMethod'] == self::DELIVERY_METHOD_MANUAL && empty($param['expressNo'])) {
             $this->error = '物流单号不能为空';
             return false;
         }