Merge pull request 'fix(admin): 修复预售订单创建逻辑' (#424) from dev into main

Reviewed-on: #424
This commit is contained in:
mkm 2025-01-04 11:43:52 +08:00
commit 300abefbed

View File

@ -411,7 +411,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==0?$arr['price']:$price, 'vip_price' => $price,
'purchase' => $arr['purchase'], 'purchase' => $arr['purchase'],
'oid' => $res['id'], 'oid' => $res['id'],
'code' => $res['code'], 'code' => $res['code'],
@ -870,10 +870,10 @@ class BeforehandOrderLogic extends BaseLogic
if($order['uid']>0){ if($order['uid']>0){
$user_ship = User::where('id', $order['uid'])->value('user_ship'); $user_ship = User::where('id', $order['uid'])->value('user_ship');
if($user_ship==0){ if($user_ship==0){
throw new BusinessException('用户id不能为0'); throw new BusinessException('用户角色id不能为0');
} }
}else{ }else{
throw new BusinessException('用户id不能为0'); throw new BusinessException('该订单没选择会员用户');
} }
$total_price = 0; $total_price = 0;
$pay_price = 0; $pay_price = 0;