diff --git a/app/admin/logic/warehouse_order/WarehouseOrderLogic.php b/app/admin/logic/warehouse_order/WarehouseOrderLogic.php index 6e4b075ab..8a31a5a44 100644 --- a/app/admin/logic/warehouse_order/WarehouseOrderLogic.php +++ b/app/admin/logic/warehouse_order/WarehouseOrderLogic.php @@ -148,6 +148,7 @@ class WarehouseOrderLogic extends BaseLogic self::setError('该订单下还有商品没有删除,请先删除商品'); return false; } + WarehouseOrder::destroy($params['id']); $find = WarehouseProduct::where('oid', $params['id'])->field('sum(nums) as nums,sum(total_price) as total_price')->find(); if ($find) { WarehouseOrder::where('id', $params['id'])->update([ @@ -155,7 +156,6 @@ class WarehouseOrderLogic extends BaseLogic 'total_price' => $find['total_price'] ]); } - WarehouseOrder::destroy($params['id']); return true; } diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php index a6b47dd68..6d0c094f2 100644 --- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php +++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php @@ -9,6 +9,7 @@ use app\common\model\purchase_product_offer\PurchaseProductOffer; use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_product\StoreProduct; use app\common\model\system_store_storage\SystemStoreStorage; +use app\common\model\warehouse_order\WarehouseOrder; use app\common\model\warehouse_product_storege\WarehouseProductStorege; use support\Log; use think\facade\Db; @@ -167,7 +168,13 @@ class WarehouseProductLogic extends BaseLogic StoreBranchProduct::where(['store_id' => $res['store_id'], 'product_id' => $res['product_id']])->dec('stock', $res['nums'])->update(); WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id', $res['product_id'])->inc('nums', $res['nums'])->update(); } - + $find = WarehouseProduct::where('oid', $res['oid'])->field('sum(nums) as nums,sum(total_price) as total_price')->find(); + if ($find) { + WarehouseOrder::where('id', $res['oid'])->update([ + 'nums' => $find['nums'], + 'total_price' => $find['total_price'] + ]); + } return true; } return false;