订单直接完成

biz-ghs/order/services/OrderService.php

@@ -256,6 +256,19 @@ class OrderService extends BaseService
             //下面二个顺序不能换
             PurchaseService::payAfter($purchase, $payWay);
             self::payAfter($returnOrder, $payWay);
+
+            //如果不是预订单，并且客户没有开通批发店，则订单直接完成掉
+            if (isset($returnOrder->book) && $returnOrder->book == 0) {
+                $customShop = ShopClass::getById($customShopId, true);
+                if (isset($customShop->pfShopId) && $customShop->pfShopId == 0) {
+                    $returnId = $returnOrder->id;
+                    $order = OrderClass::getById($returnId, true);
+                    if (!empty($order)) {
+                        OrderClass::confirmReach($order);
+                    }
+                }
+            }
+
         }
 
         return $returnOrder;