123

app/store/service/order/Delivery.php

@@ -50,11 +50,11 @@ class Delivery extends BaseService
      */
     public function delivery(int $orderId, array $param): bool
     {
-        if(empty($param['expressId'])) {
+        if($param["deliveryMethod"] == self::DELIVERY_METHOD_MANUAL && empty($param['expressId'])) {
             $this->error = '物流公司不能为空';
             return false;
         }
-        if (empty($param['expressNo'])) {
+        if ($param["deliveryMethod"] == self::DELIVERY_METHOD_MANUAL && empty($param['expressNo'])) {
             $this->error = '物流单号不能为空';
             return false;
         }