Browse Source

fix:你为绑定供应商

super-yimizi 1 month ago
parent
commit
8764e06788

+ 3 - 6
application/common/Service/OrderService.php

@@ -916,15 +916,12 @@ class OrderService
         if (!$orderData) {
             return false;
         }
-        
-        $order = $orderData['order'];
+    
         $orderGoods = $orderData['order_goods'];
-        
-        // 检查订单状态是否允许发货(验收通过状态)
-        if ($order['order_status'] != OrderEnum::STATUS_INSPECTION_PASS) {
+        // 检查订单商品的状态是都验货通过才可以发货
+        if ($orderGoods['inspect_status'] !== 1) {
             return false;
         }
-        
         // 检查该订单商品是否已经发货
         if ($orderGoods['delivery_status'] == 1) {
             return false;

+ 3 - 6
application/common/service/OrderService.php

@@ -916,15 +916,12 @@ class OrderService
         if (!$orderData) {
             return false;
         }
-        
-        $order = $orderData['order'];
+    
         $orderGoods = $orderData['order_goods'];
-        
-        // 检查订单状态是否允许发货(验收通过状态)
-        if ($order['order_status'] != OrderEnum::STATUS_INSPECTION_PASS) {
+        // 检查订单商品的状态是都验货通过才可以发货
+        if ($orderGoods['inspect_status'] !== 1) {
             return false;
         }
-        
         // 检查该订单商品是否已经发货
         if ($orderGoods['delivery_status'] == 1) {
             return false;