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

Merge pull request 'fix(admin): 修复商品信息获取不包含软删除数据问题' (#341) from dev into main

Browse Source 
Reviewed-on: #341
This commit is contained in:
mkm 2024-11-16 10:45:31 +08:00
commit a75ef9a6a0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/admin/logic/beforehand_order/BeforehandOrderLogic.php
View File

@ -545,7 +545,7 @@ class BeforehandOrderLogic extends BaseLogic
$order = BeforehandOrder::where('id', $params['id'])->find();
$order['admin_name'] = Admin::where('id', $order['admin_id'])->value('name');
$data = BeforehandOrderCartInfo::where('bhoid', $params['id'])->select()->each(function ($item) {
$find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->find();
$find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->withTrashed()->find();
$item['top_cate_name'] = StoreCategory::where('id', $find['top_cate_id'])->value('name');
$item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');
$item['store_name'] = $find['store_name'];
@ -566,7 +566,7 @@ class BeforehandOrderLogic extends BaseLogic
$order = BeforehandOrder::where('id', $params['id'])->find();
$order['admin_name'] = Admin::where('id', $order['admin_id'])->value('name');
$data = BeforehandOrderCartInfo::where('bhoid', $params['id'])->select()->each(function ($item) {
$find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->find();
$find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->withTrashed()->find();
$item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');
$item['store_name'] = $find['store_name'];
return $item;
@ -599,7 +599,7 @@ class BeforehandOrderLogic extends BaseLogic
$order = BeforehandOrder::where('id', $params['id'])->find();
$order['admin_name'] = Admin::where('id', $order['admin_id'])->value('name');
$data = PurchaseProductOffer::where('order_id', $params['id'])->select()->each(function ($item) {
$find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit,gross_weight,net_weight')->find();
$find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit,gross_weight,net_weight')->withTrashed()->find();
$item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');
$item['buyer_name'] = User::where('id', $item['buyer_id'])->value('real_name');
$item['store_name'] = $find['store_name'];
@ -625,7 +625,7 @@ class BeforehandOrderLogic extends BaseLogic
}
$order['admin_name'] = Admin::where('id', $order['admin_id'])->value('name');
$data = WarehouseProduct::where('oid', $order['outbound_id'])->where('nums', '>', 0)->select()->each(function ($item) {
$find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->find();
$find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->withTrashed()->find();
$item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');
$item['store_name'] = $find['store_name'];
return $item;
@ -649,7 +649,7 @@ class BeforehandOrderLogic extends BaseLogic
$order = BeforehandOrder::where('id', $params['id'])->find();
$data = WarehouseProductReturn::where('bhoid', $order['id'])->where('return_type',1)->select()->each(function ($item) {
$find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->find();
$find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->withTrashed()->find();
$item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');
$item['store_name'] = $find['store_name'];
return $item;
@ -674,7 +674,7 @@ class BeforehandOrderLogic extends BaseLogic
$order = BeforehandOrder::where('id', $params['id'])->find();
$data = WarehouseProductReturn::where('bhoid', $order['id'])->where('return_type',2)->select()->each(function ($item) {
$find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->find();
$find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->withTrashed()->find();
$item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');
$item['store_name'] = $find['store_name'];
return $item;