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

Merge pull request 'feat(order): 调整订单逻辑优先级' (#48) from dev into main

Browse Source 
Reviewed-on: #48
This commit is contained in:
mkm 2024-07-23 09:13:52 +08:00
commit fcdc6572f2
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,7 @@ class OrderLogic extends BaseLogic
} else { } else {
$price = $find['price']; $price = $find['price'];
} }
if($off_activity==0 && $user&&$user['user_ship']==5 && $find['top_cate_id']==15189){ if($off_activity==0 && $find['top_cate_id']==15189 && $user&&$user['user_ship']==5){
$price=$find['cost']; $price=$find['cost'];
} }
$cart_select[$k]['price'] = $price; $cart_select[$k]['price'] = $price;
@ -588,7 +588,6 @@ class OrderLogic extends BaseLogic
'staff_id' => $params['staff_id'] ?? 0, 'staff_id' => $params['staff_id'] ?? 0,
'update_time' => time(), 'update_time' => time(),
], ['oid' => $order['id']]); ], ['oid' => $order['id']]);
PayNotifyLogic::descStock($order['id']);
$financeFlow = new StoreFinanceFlow(); $financeFlow = new StoreFinanceFlow();
$financeFlowLogic = new StoreFinanceFlowLogic(); $financeFlowLogic = new StoreFinanceFlowLogic();
$select_1 = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 1, 'financial_type' => ['in' => 14, 15, 16]])->select(); $select_1 = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 1, 'financial_type' => ['in' => 14, 15, 16]])->select();