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

Merge pull request 'dev' (#542) from dev into main

Browse Source 
Reviewed-on: #542
This commit is contained in:
mkm 2025-03-06 17:02:03 +08:00
commit ba46f11f0b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/lists/store_product/StoreProductLists.php
View File

@ -138,9 +138,9 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
$category = StoreCategory::where('id', 'in', [$item['top_cate_id'], $item['two_cate_id'], $item['cate_id']])->column('name');
$item['cate_name'] = implode('/', $category);
if ($is_warehouse == 1) {
$item['stock'] = WarehouseProductStorege::where('product_id', $item['id'])->sum('nums');
$item['stock'] = WarehouseProductStorege::where('product_id', $item['id'])->where('warehouse_id', 1)->sum('nums');
} else {
$nums = WarehouseProductStorege::where('product_id', $item['id'])->sum('nums');
$nums = WarehouseProductStorege::where('product_id', $item['id'])->where('warehouse_id', 1)->sum('nums');
$item['stock'] = bcadd($nums, $stock);
}
if ($userShip == 4) {

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

@ -89,6 +89,8 @@ class BeforehandOrderLogic extends BaseLogic
unset($params['product_arr'][$k]);
continue;
}
$v['price'] = trim($v['price']);
$v['nums'] = trim($v['nums']);
$total_prices = bcmul($v['price'], $v['nums'], 2);
$datas[$k]['purchase'] = $v['purchase'];
$datas[$k]['mark'] = $v['mark'] ?? '';

4
app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
View File

@ -498,11 +498,11 @@ class PurchaseProductOfferLogic extends BaseLogic
$purchaseOffer = [];
$cartInfo = [];
foreach ($params['product_arr'] as $product) {
$product['price'] = trim($product['price']);
$product['nums'] = trim($product['nums']);
if ($product['product_id'] <= 0) {
continue;
}
$product['price'] = trim($product['price']);
$product['nums'] = trim($product['nums']);
$cartInfo[] = [
'bhoid' => $procurementOrder['id'],
'product_id' => $product['product_id'],