mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(store_product): 修改库存处理逻辑，优化代码结构

Browse Source
This commit is contained in:
mkm 2024-08-13 11:38:12 +08:00
parent ead2595094
commit ea4716f661
4 changed files with 34 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
app/admin/logic/store_product/StoreProductLogic.php
View File

@ -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\store_product_cate\StoreProductCate;
use app\common\model\system_store\SystemStore; use app\common\model\system_store\SystemStore;
use app\common\model\system_store_storage\SystemStoreStorage; 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 Illuminate\Support\Facades\Log;
use think\facade\Db; use think\facade\Db;
use Webman\RedisQueue\Redis; use Webman\RedisQueue\Redis;
@ -456,21 +454,22 @@ class StoreProductLogic extends BaseLogic
Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile()); Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile());
return false; return false;
} }
} else { }
//更新门店库存 // else {
Db::startTrans(); // //更新门店库存
try { // Db::startTrans();
// if ($product_arr['stock'] > 0) { // try {
// self::storage($find, $store_id, $admin_id, $product_arr,1,$warehouse_id); // // if ($product_arr['stock'] > 0) {
// } // // self::storage($find, $store_id, $admin_id, $product_arr,1,$warehouse_id);
Db::commit(); // // }
return true; // Db::commit();
} catch (\Exception $e) { // return true;
Db::rollback(); // } catch (\Exception $e) {
Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile()); // Db::rollback();
return false; // Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile());
} // return false;
} // }
// }
} }
/**兑换 */ /**兑换 */
@ -497,9 +496,7 @@ class StoreProductLogic extends BaseLogic
'stock' => 0, 'stock' => 0,
]; ];
StoreBranchProductExchange::create($product); StoreBranchProductExchange::create($product);
// if ($product_arr['stock'] > 0) {
// self::storage($find, $store_id, $admin_id, $product_arr,$warehouse_id);
// }
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
@ -507,56 +504,20 @@ class StoreProductLogic extends BaseLogic
Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile()); Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile());
return false; return false;
} }
} else { }
Db::startTrans(); // else {
try { // Db::startTrans();
// if ($product_arr['stock'] > 0) { // try {
// self::storage($find, $store_id, $admin_id, $product_arr,2,$warehouse_id); // // if ($product_arr['stock'] > 0) {
// } // // self::storage($find, $store_id, $admin_id, $product_arr,2,$warehouse_id);
Db::commit(); // // }
return true; // Db::commit();
} catch (\Exception $e) { // return true;
Db::rollback(); // } catch (\Exception $e) {
Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile()); // Db::rollback();
return false; // 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);
}
} }
} }

10
app/admin/logic/system_store_storage/SystemStoreStorageLogic.php
View File

@ -61,14 +61,7 @@ class SystemStoreStorageLogic extends BaseLogic
*/ */
public static function edit(array $params): bool public static function edit(array $params): bool
{ {
$find=SystemStoreStorage::where('id', $params['id'])->find(); return true;
//查看仓库库存
$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;
}
Db::startTrans(); Db::startTrans();
try { try {
SystemStoreStorage::where('id', $params['id'])->update([ SystemStoreStorage::where('id', $params['id'])->update([
@ -77,7 +70,6 @@ class SystemStoreStorageLogic extends BaseLogic
'status' => 0, 'status' => 0,
'mark' => '', 'mark' => '',
]); ]);
StoreProduct::where('id', $params['product_id'])->inc('stock',bcsub($find['nums'] ,$params['nums'],2))->update();
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {

1
app/admin/logic/warehouse_product/WarehouseProductLogic.php
View File

@ -42,7 +42,6 @@ class WarehouseProductLogic extends BaseLogic
$after_nums=$storege['nums']-$params['nums']; $after_nums=$storege['nums']-$params['nums'];
if($after_nums<0){ if($after_nums<0){
throw new BusinessException('库存不足'); throw new BusinessException('库存不足');
return false;
} }
WarehouseProductStorege::where('id', $storege['id'])->dec('nums', $params['nums'])->update(); WarehouseProductStorege::where('id', $storege['id'])->dec('nums', $params['nums'])->update();
} else { } else {

1
app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php
View File

@ -56,6 +56,7 @@ class WarehouseProductStoregeLogic extends BaseLogic
*/ */
public static function edit(array $params): bool public static function edit(array $params): bool
{ {
return true;
Db::startTrans(); Db::startTrans();
try { try {
WarehouseProductStorege::where('id', $params['id'])->update([ WarehouseProductStorege::where('id', $params['id'])->update([