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

Merge pull request 'refactor(admin): 重构前置订单中的会员价格获取逻辑' (#540) from dev into main

Browse Source 
Reviewed-on: #540
This commit is contained in:
mkm 2025-03-05 17:45:31 +08:00
commit c5733df38f
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

@ -424,11 +424,11 @@ class BeforehandOrderLogic extends BaseLogic
$res = WarehouseOrder::create($arr); $res = WarehouseOrder::create($arr);
$totalPrice = '0.00'; $totalPrice = '0.00';
foreach ($info as $key => $arr) { foreach ($info as $key => $arr) {
if ($user_ship == 0) { // if ($user_ship == 0) {
$price = 0; // $price = 0;
} else { // } else {
$price = StoreProductGroupPrice::where('product_id', $arr['product_id'])->where('group_id', $user_ship)->value('price') ?? 0; // $price = StoreProductGroupPrice::where('product_id', $arr['product_id'])->where('group_id', $user_ship)->value('price') ?? 0;
} // }
$data = [ $data = [
'warehouse_id' => $warehouse_id, 'warehouse_id' => $warehouse_id,
'product_id' => $arr['product_id'], 'product_id' => $arr['product_id'],
@ -441,7 +441,7 @@ class BeforehandOrderLogic extends BaseLogic
'admin_id' => $admin_id, 'admin_id' => $admin_id,
'total_price' => $arr['total_price'], 'total_price' => $arr['total_price'],
'price' => $arr['price'], 'price' => $arr['price'],
'vip_price' => $price, 'vip_price' => StoreProduct::where('id',$arr['product_id'])->withTrashed()->value('vip_price') ?? 0,
'purchase' => $arr['purchase'], 'purchase' => $arr['purchase'],
'oid' => $res['id'], 'oid' => $res['id'],
'code' => $res['code'], 'code' => $res['code'],