shish 2 anos atrás
pai
commit
4a94aeb24a
1 arquivos alterados com 4 adições e 4 exclusões
  1. 4 4
      biz-ghs/order/classes/OrderClass.php

+ 4 - 4
biz-ghs/order/classes/OrderClass.php

@@ -121,10 +121,6 @@ class OrderClass extends BaseClass
 
 
     public static function confirmReach($order)
     public static function confirmReach($order)
     {
     {
-        //订单如果没有发货,则先发货
-        if ($order->status == 2) {
-            self::orderSend($order, [], true);
-        }
         $cgId = $order->purchaseId ?? 0;
         $cgId = $order->purchaseId ?? 0;
         $cg = PurchaseClass::getById($cgId, true);
         $cg = PurchaseClass::getById($cgId, true);
         if (empty($cg)) {
         if (empty($cg)) {
@@ -143,6 +139,10 @@ class OrderClass extends BaseClass
         if (isset($customShop->pfShopId) && !empty($customShop->pfShopId)) {
         if (isset($customShop->pfShopId) && !empty($customShop->pfShopId)) {
             util::fail('客户有批发店,请通知对方确认');
             util::fail('客户有批发店,请通知对方确认');
         }
         }
+        //订单如果没有发货则先发货
+        if ($order->status == 2) {
+            self::orderSend($order, [], true);
+        }
         PurchaseClass::takeToPutIn($cg);
         PurchaseClass::takeToPutIn($cg);
     }
     }