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

Merge pull request 'fix(admin): 修复预约订单参数为空时的处理逻辑' (#295) from dev into main

Browse Source 
Reviewed-on: #295
This commit is contained in:
mkm 2024-10-30 14:48:37 +08:00
commit 07a2527e62
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,16 +63,16 @@ class BeforehandOrderLogic extends BaseLogic
$datas[$k]['mark'] = $v['mark'] ?? '';
$datas[$k]['product_id'] = $v['product_id'];
$datas[$k]['uid'] = $uid;
$datas[$k]['marques'] = $v['marques'];
$datas[$k]['store_info'] = $v['store_info'];
$datas[$k]['after_sales'] = $v['after_sales'];
$datas[$k]['loss'] = $v['loss'];
$datas[$k]['unit'] = $v['unit'];
$datas[$k]['gross_weight'] = $v['gross_weight'];
$datas[$k]['net_weight'] = $v['net_weight'];
$datas[$k]['marques'] = $v['marques']??'';
$datas[$k]['store_info'] = $v['store_info']??'';
$datas[$k]['after_sales'] = $v['after_sales']??'';
$datas[$k]['loss'] = $v['loss']??'';
$datas[$k]['unit'] = $v['unit']??'';
$datas[$k]['gross_weight'] = $v['gross_weight']??'';
$datas[$k]['net_weight'] = $v['net_weight']??'';
$datas[$k]['cart_num'] = $v['nums'];
$datas[$k]['price'] = $v['price'];
$datas[$k]['package'] = $v['package'];
$datas[$k]['package'] = $v['package']??'';
$datas[$k]['total_price'] = $v['total_price'];
$datas[$k]['create_time'] = time();
$datas[$k]['update_time'] = time();
@ -102,28 +102,28 @@ class BeforehandOrderLogic extends BaseLogic
$datas[$k]['bhoid'] = $order['id'];
$data['id']=$v['product_id'];
if($v['marques']){
if($v['marques']!=''){
$data['marques']=$v['marques'];
}
if($v['store_info']){
if($v['store_info']!=''){
$data['store_info']=$v['store_info'];
}
if($v['after_sales']){
if($v['after_sales']!=''){
$data['after_sales']=$v['after_sales'];
}
if($v['package']){
if($v['package']!=''){
$data['package']=$v['package'];
}
if($v['loss']){
if($v['loss']!=''){
$data['loss']=$v['loss'];
}
if($v['gross_weight']){
if($v['gross_weight']!=''){
$data['gross_weight']=$v['gross_weight'];
}
if($v['net_weight']){
if($v['net_weight']!=''){
$data['net_weight']=$v['net_weight'];
}
if($v['mark']){
if($v['mark']!=''){
$data['mark']=$v['mark'];
}
$product_arr[]=$data;