|
@@ -3586,7 +3586,6 @@ class MOrder extends MBaseModel
|
|
|
$unlockResult = self::unlockInventory($id, $orderData);
|
|
|
if (!$unlockResult->isSuccess()) {
|
|
|
$this->objDOrderIndex->rollBack();
|
|
|
- var_dump("xxxaa");
|
|
|
return ResultWrapper::fail($unlockResult->getData(), $unlockResult->getErrorCode());
|
|
|
}
|
|
|
|
|
@@ -3799,7 +3798,8 @@ class MOrder extends MBaseModel
|
|
|
$objMInventory = new MInventory($this->onlineEnterpriseId, $this->onlineUserId);
|
|
|
$unlockResult = $objMInventory->unlockInventory([$id], StatusCode::$orderType['saleOrder'], $params['createTime']);
|
|
|
if (!$unlockResult->isSuccess()) {
|
|
|
- return ResultWrapper::fail($unlockResult->getData(), ErrorCode::$dberror);
|
|
|
+ //暂时关闭,没发现有锁定的地方
|
|
|
+// return ResultWrapper::fail($unlockResult->getData(), ErrorCode::$dberror);
|
|
|
}
|
|
|
|
|
|
self::noticeStatistics([
|