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

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

Browse Source 
Reviewed-on: #160
This commit is contained in:
mkm 2024-08-26 13:26:05 +08:00
commit 0c8d186bc1
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/logic/store_branch_product/StoreBranchProductLogic.php
View File

@ -90,12 +90,12 @@ class StoreBranchProductLogic extends BaseLogic
$stock = bcadd($find['stock'], $params['nums'], 2); $stock = bcadd($find['stock'], $params['nums'], 2);
$branchStock = bcadd($storeBranchProduct['stock'], $params['nums'], 2); $branchStock = bcadd($storeBranchProduct['stock'], $params['nums'], 2);
StoreBranchProduct::where('id', $params['id'])->update(['stock' => $stock, 'total_price' => bcmul($branchStock, $find['purchase'], 2)]); StoreBranchProduct::where('id', $params['id'])->update(['stock' => $branchStock, 'total_price' => bcmul($branchStock, $find['purchase'], 2)]);
StoreProduct::where('id', $params['product_id'])->update(['stock' => $stock, 'total_price' => bcmul($stock, $find['purchase'], 2)]); StoreProduct::where('id', $params['product_id'])->update(['stock' => $stock, 'total_price' => bcmul($stock, $find['purchase'], 2)]);
} else { } else {
$branchStock = bcsub($storeBranchProduct['stock'], $params['nums'], 2); $branchStock = bcsub($storeBranchProduct['stock'], $params['nums'], 2);
$stock = bcsub($find['stock'], $params['nums'], 2); $stock = bcsub($find['stock'], $params['nums'], 2);
StoreBranchProduct::where('id', $params['id'])->update(['stock' => $stock, 'total_price' => bcmul($branchStock, $find['purchase'], 2)]); StoreBranchProduct::where('id', $params['id'])->update(['stock' => $branchStock, 'total_price' => bcmul($branchStock, $find['purchase'], 2)]);
StoreProduct::where('id', $params['product_id'])->update(['stock' => $stock, 'total_price' => bcmul($stock, $find['purchase'], 2)]); StoreProduct::where('id', $params['product_id'])->update(['stock' => $stock, 'total_price' => bcmul($stock, $find['purchase'], 2)]);
} }
Db::commit(); Db::commit();

1
app/api/logic/order/CartLogic.php
View File

@ -51,7 +51,6 @@ class CartLogic extends BaseLogic
'product_id' => $params['product_id'], 'product_id' => $params['product_id'],
'store_id' => $params['store_id'] ?? 0, 'store_id' => $params['store_id'] ?? 0,
'staff_id' => $params['staff_id'] ?? 0, 'staff_id' => $params['staff_id'] ?? 0,
'product_attr_unique' => '',
'cart_num' => $params['cart_num'], 'cart_num' => $params['cart_num'],
'is_new' => $params['is_new'] ?? 0, 'is_new' => $params['is_new'] ?? 0,
]); ]);

1
app/api/logic/order/OrderLogic.php
View File

@ -481,7 +481,6 @@ class OrderLogic extends BaseLogic
$data = []; $data = [];
foreach ($arr as $k => $v) { foreach ($arr as $k => $v) {
$data[$k]['product_id'] = $v['product_id']; $data[$k]['product_id'] = $v['product_id'];
$data[$k]['product_attr_unique'] = '';
$data[$k]['cart_num'] = $v['cart_num']; $data[$k]['cart_num'] = $v['cart_num'];
$data[$k]['type'] = ''; $data[$k]['type'] = '';
$data[$k]['uid'] = Request()->userId; $data[$k]['uid'] = Request()->userId;

2
app/api/validate/CartValidate.php
View File

@ -20,7 +20,6 @@ class CartValidate extends BaseValidate
*/ */
protected $rule = [ protected $rule = [
'cart_num' => 'require', 'cart_num' => 'require',
'product_attr_unique' => 'require',
'store_id' => 'require|number', 'store_id' => 'require|number',
'staff_id' => 'require|number', 'staff_id' => 'require|number',
'product_id' => 'require|number', 'product_id' => 'require|number',
@ -36,7 +35,6 @@ class CartValidate extends BaseValidate
'store_id' => '店铺id', 'store_id' => '店铺id',
'staff_id' => '员工id', 'staff_id' => '员工id',
'product_id' => '商品id', 'product_id' => '商品id',
'product_attr_unique' => '商品规格',
]; ];