免配送问题

app-ghs/controllers/OrderController.php

@@ -5,7 +5,6 @@ namespace ghs\controllers;
 use bizGhs\express\services\DadaExpressServices;
 use bizHd\wx\classes\WxOpenClass;
 use bizGhs\custom\classes\CustomClass;
-use bizGhs\merchant\services\ShopService;
 use bizGhs\order\classes\OrderClass;
 use bizGhs\order\services\OrderService;
 use bizHd\saas\services\RegionService;

biz-ghs/order/services/OrderService.php

@@ -76,11 +76,6 @@ class OrderService extends BaseService
         self::payAfter($return, $payWay);
         PurchaseService::payAfter($purchase, $payWay);
 
-        //自取订单直接完成
-        if (isset($data['sendType']) && $data['sendType'] == OrderClass::SEND_TYPE_NO) {
-            self::withoutSend($return);
-        }
-
         return $return->attributes;
     }
 
@@ -472,6 +467,7 @@ class OrderService extends BaseService
         if ($order->sendType == OrderClass::SEND_TYPE_NO) {
             self::withoutSend($order);
         }
+
     }
 
 }

biz-hd/purchase/services/PurchaseService.php

@@ -72,7 +72,8 @@ class PurchaseService extends BaseService
         ];
         $result = OrderClass::addOrder($arr);
         $saleId = $result['id'] ?? 0;
-        PurchaseClass::updateById($purchaseId, ['saleId' => $saleId]);
+        $respond->saleId = $saleId;
+        $respond->save();
 
         return $respond;
     }