订单管理

biz-hd/order/services/OrderSendService.php

@@ -2,6 +2,7 @@
 
 namespace bizHd\order\services;
 
+use biz\shop\models\Shop;
 use bizHd\base\services\BaseService;
 use bizHd\goods\classes\CategoryClass;
 use bizHd\goods\classes\UsageClass;
@@ -102,11 +103,14 @@ class OrderSendService extends BaseService
         OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_SENDING, 'currentFlow' => 3, 'sendType' => $sendType]);
 
         //待发货订单-1，配送中订单+1
-        $merchantId = $data['merchantId'];
-        $asset = MerchantAssetClass::getByMerchantId($merchantId, true);
-        $asset->unSendOrder -= 1;
-        $asset->sendingOrder += 1;
-        $asset->save();
+        $shopId = $data['shopId'];
+        $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
+        if (empty($shop)) {
+            util::fail('没有找到门店');
+        }
+        $shop->unSendOrder -= 1;
+        $shop->sendingOrder += 1;
+        $shop->save();
 
         //进入送达流程
         $reachId = $actionIdList['reach'];
@@ -133,11 +137,11 @@ class OrderSendService extends BaseService
         OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_COMPLETE, 'currentFlow' => OrderClass::ORDER_TOTAL_FLOW]);
 
         //配送中订单-1，完成订单+1
-        $merchantId = $order['merchantId'];
-        $asset = MerchantAssetClass::getByMerchantId($merchantId, true);
-        $asset->sendingOrder -= 1;
-        $asset->finishOrder += 1;
-        $asset->save();
+        $shopId = $order['shopId'];
+        $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
+        $shop->sendingOrder -= 1;
+        $shop->finishOrder += 1;
+        $shop->save();
         util::complete();
     }