sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

商品不存在库存错误修复，默认仓库不存在优化

feat/task1-c-wallet
gongfuxiang 2025-11-11 09:03:21 +08:00
parent 904981249a
commit 586b61c7e3
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/service/OrderSplitService.php
View File

@ -357,7 +357,13 @@ class OrderSplitService
// 未获取到仓库则使用默认仓库 // 未获取到仓库则使用默认仓库
if(empty($warehouse_default)) if(empty($warehouse_default))
{ {
// 先获取默认仓库
$warehouse_default = Db::name('Warehouse')->where(['is_default'=>1, 'is_enable'=>1, 'is_delete_time'=>0])->field('id,name,alias,lng,lat,province,city,county,address')->find(); $warehouse_default = Db::name('Warehouse')->where(['is_default'=>1, 'is_enable'=>1, 'is_delete_time'=>0])->field('id,name,alias,lng,lat,province,city,county,address')->find();
if(empty($warehouse_default))
{
// 没有默认仓库则获取最早的一个仓库
$warehouse_default = Db::name('Warehouse')->where(['is_enable'=>1, 'is_delete_time'=>0])->field('id,name,alias,lng,lat,province,city,county,address')->order('id asc')->find();
}
} }
$temp_warehouse_default = $warehouse_default; $temp_warehouse_default = $warehouse_default;

14
app/service/WarehouseGoodsService.php
View File

@ -817,7 +817,8 @@ class WarehouseGoodsService
if(empty($spec['value'])) if(empty($spec['value']))
{ {
// 没有规格则读取默认规格数据 // 没有规格则读取默认规格数据
$base = array_merge(Db::name('GoodsSpecBase')->where(['goods_id'=>$goods_id])->field('id as base_id,inventory,inventory_unit')->find(), ['value'=>'default']); $base = Db::name('GoodsSpecBase')->where(['goods_id'=>$goods_id])->field('id as base_id,inventory,inventory_unit')->find();
$base = array_merge(empty($base) ? [] : $base, ['value'=>'default']);
$spec['value'] = [$base]; $spec['value'] = [$base];
} else { } else {
$temp_base = Db::name('GoodsSpecBase')->where(['id'=>array_column($spec['value'], 'base_id')])->column('inventory_unit', 'id'); $temp_base = Db::name('GoodsSpecBase')->where(['id'=>array_column($spec['value'], 'base_id')])->column('inventory_unit', 'id');
@ -832,12 +833,15 @@ class WarehouseGoodsService
$inventory_total = 0; $inventory_total = 0;
foreach($spec['value'] as &$v) foreach($spec['value'] as &$v)
{ {
$v['inventory'] = self::WarehouseGoodsSpecInventory($goods_id, str_replace(GoodsService::$goods_spec_to_string_separator, '', $v['value'])); if(!empty($v['base_id']))
if(Db::name('GoodsSpecBase')->where(['id'=>$v['base_id'], 'goods_id'=>$goods_id])->update(['inventory'=>$v['inventory']]) === false)
{ {
return DataReturn(MyLang('common_service.warehousegoods.goods_spec_sync_inventory_fail_tips'), -20); $v['inventory'] = self::WarehouseGoodsSpecInventory($goods_id, str_replace(GoodsService::$goods_spec_to_string_separator, '', $v['value']));
if(Db::name('GoodsSpecBase')->where(['id'=>$v['base_id'], 'goods_id'=>$goods_id])->update(['inventory'=>$v['inventory']]) === false)
{
return DataReturn(MyLang('common_service.warehousegoods.goods_spec_sync_inventory_fail_tips'), -20);
}
$inventory_total += $v['inventory'];
} }
$inventory_total += $v['inventory'];
} }
// 商品库存 // 商品库存