修改

Model/Order/MOrder.Class.php

@@ -5784,6 +5784,10 @@ class MOrder extends MBaseModel
                     'categoryName' => isset($v['categoryName']) ? $v['categoryName'] : '',
                     'brandName'    => isset($v['brandName']) ? $v['brandName'] : '',
                     'expressMoney' => isset($v['expressMoney']) ? $v['expressMoney'] : 0,
+                    'outNum'       => 0,//已出库数量
+                    'outOfNum'     => getArrayItem($v, 'buyNum', 0),//未出库数量
+                    'isEq'         => getArrayItem($v,'isEq',StatusCode::$delete),
+                    'extends'      => json_encode(getArrayItem($v, 'extends', null)),
                 ];
                 $lockInventoryData[] = [
                     'warehouseId'  => $shopData[$v['shopId']]['warehouseId'],
@@ -5852,8 +5856,7 @@ class MOrder extends MBaseModel
 
         //锁定库存商品数量
         $objMInventory = new MInventory($this->onlineEnterpriseId, $this->onlineUserId);
-        //$shopId,
-        $lockInventoryResult = $objMInventory->updateLockInventory($lockInventoryData);
+        $lockInventoryResult = $objMInventory->updateLockInventory($shopId,$lockInventoryData);
         if (!$lockInventoryResult->isSuccess()) {
             $this->objDOrder->rollBack();
             return ResultWrapper::fail($lockInventoryResult->getData(), $lockInventoryResult->getErrorCode());