From ea4716f661f7b89ed93013ca754762f0a2a30f72 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 13 Aug 2024 11:38:12 +0800 Subject: [PATCH] =?UTF-8?q?feat(store=5Fproduct):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/store_product/StoreProductLogic.php | 103 ++++++------------ .../SystemStoreStorageLogic.php | 10 +- .../WarehouseProductLogic.php | 1 - .../WarehouseProductStoregeLogic.php | 1 + 4 files changed, 34 insertions(+), 81 deletions(-) diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index cf07e3b4..de028078 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -13,8 +13,6 @@ use app\common\model\store_product_attr_value\StoreProductAttrValue; use app\common\model\store_product_cate\StoreProductCate; use app\common\model\system_store\SystemStore; use app\common\model\system_store_storage\SystemStoreStorage; -use app\common\model\warehouse_product_storege\WarehouseProductStorege; -use app\Request; use Illuminate\Support\Facades\Log; use think\facade\Db; use Webman\RedisQueue\Redis; @@ -456,21 +454,22 @@ class StoreProductLogic extends BaseLogic Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile()); return false; } - } else { - //更新门店库存 - Db::startTrans(); - try { - // if ($product_arr['stock'] > 0) { - // self::storage($find, $store_id, $admin_id, $product_arr,1,$warehouse_id); - // } - Db::commit(); - return true; - } catch (\Exception $e) { - Db::rollback(); - Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile()); - return false; - } - } + } + // else { + // //更新门店库存 + // Db::startTrans(); + // try { + // // if ($product_arr['stock'] > 0) { + // // self::storage($find, $store_id, $admin_id, $product_arr,1,$warehouse_id); + // // } + // Db::commit(); + // return true; + // } catch (\Exception $e) { + // Db::rollback(); + // Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile()); + // return false; + // } + // } } /**兑换 */ @@ -497,9 +496,7 @@ class StoreProductLogic extends BaseLogic 'stock' => 0, ]; StoreBranchProductExchange::create($product); - // if ($product_arr['stock'] > 0) { - // self::storage($find, $store_id, $admin_id, $product_arr,$warehouse_id); - // } + Db::commit(); return true; } catch (\Exception $e) { @@ -507,56 +504,20 @@ class StoreProductLogic extends BaseLogic Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile()); return false; } - } else { - Db::startTrans(); - try { - // if ($product_arr['stock'] > 0) { - // self::storage($find, $store_id, $admin_id, $product_arr,2,$warehouse_id); - // } - Db::commit(); - return true; - } catch (\Exception $e) { - Db::rollback(); - Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile()); - return false; - } - } - } - public static function storage($find, $store_id, $admin_id, $product_arr,$stock_type=1,$warehouse_id=0) - { - $storage = [ - 'product_id' => $product_arr['id'], - 'store_id' => $store_id, - 'nums' => $product_arr['stock'], - 'admin_id' => $admin_id, - 'type' => $stock_type, - 'warehouse_id'=>$warehouse_id, - ]; - $data=[ - 'warehouse_id'=>$warehouse_id, - 'product_id' => $product_arr['id'], - 'store_id' => $store_id, - 'financial_pm' => 0, - 'batch' => $product_arr['batch']??1, - 'nums' => $product_arr['stock'], - 'status' =>1, - 'admin_id' =>$admin_id, - ]; - $warehouse=WarehouseProductStorege::where('warehouse_id',$warehouse_id)->where('product_id',$product_arr['id'])->find(); - if ($warehouse) { - if($warehouse['nums']< $product_arr['stock']){ - $storage['status'] = -1; - $data['status'] = -1; - $storage['mark'] = '库存【'.$warehouse_id.'】不足,分库存为:' .$warehouse['nums']; - $data['mark'] = '库存【'.$warehouse_id.'】不足,分库存为:' .$warehouse['nums'].' 总仓库存为:'.$find['stock']; - } - $res=WarehouseProductLogic::add($data); - $storage['outbound_id']=$res['id']??0; - SystemStoreStorage::create($storage); - } else { - $res=WarehouseProductLogic::add($data); - $storage['outbound_id']=$res['id']??0; - SystemStoreStorage::create($storage); - } + } + // else { + // Db::startTrans(); + // try { + // // if ($product_arr['stock'] > 0) { + // // self::storage($find, $store_id, $admin_id, $product_arr,2,$warehouse_id); + // // } + // Db::commit(); + // return true; + // } catch (\Exception $e) { + // Db::rollback(); + // Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile()); + // return false; + // } + // } } } diff --git a/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php b/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php index 9e95ec0a..03fac3ae 100644 --- a/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php +++ b/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php @@ -61,14 +61,7 @@ class SystemStoreStorageLogic extends BaseLogic */ public static function edit(array $params): bool { - $find=SystemStoreStorage::where('id', $params['id'])->find(); - - //查看仓库库存 - $productStorege=WarehouseProductStorege::where('product_id', $params['product_id'],['warehouse_id'=>$find['warehouse_id']])->find(); - if($productStorege && $productStorege['nums']<$params['nums']){ - self::setError('库存不足,仓库库存为:'.$productStorege['nums']); - return false; - } + return true; Db::startTrans(); try { SystemStoreStorage::where('id', $params['id'])->update([ @@ -77,7 +70,6 @@ class SystemStoreStorageLogic extends BaseLogic 'status' => 0, 'mark' => '', ]); - StoreProduct::where('id', $params['product_id'])->inc('stock',bcsub($find['nums'] ,$params['nums'],2))->update(); Db::commit(); return true; } catch (\Exception $e) { diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php index 7aef771d..78b0db94 100644 --- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php +++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php @@ -42,7 +42,6 @@ class WarehouseProductLogic extends BaseLogic $after_nums=$storege['nums']-$params['nums']; if($after_nums<0){ throw new BusinessException('库存不足'); - return false; } WarehouseProductStorege::where('id', $storege['id'])->dec('nums', $params['nums'])->update(); } else { diff --git a/app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php b/app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php index eac41ece..a1da050d 100644 --- a/app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php +++ b/app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php @@ -56,6 +56,7 @@ class WarehouseProductStoregeLogic extends BaseLogic */ public static function edit(array $params): bool { + return true; Db::startTrans(); try { WarehouseProductStorege::where('id', $params['id'])->update([