From 9c63e3ac9dd6458b802b316ccc14033675a0002c Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 30 Oct 2024 14:48:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(admin):=20=E4=BF=AE=E5=A4=8D=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E8=AE=A2=E5=8D=95=E5=8F=82=E6=95=B0=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 BeforehandOrderLogic 中，对所有可能为空的参数使用了空合并运算符 (??) 进行默认值处理
- 修改了条件判断语句，使用不等于空字符串的判断方式，以确保空值能够被正确处理
- 此修改避免了在接收到空参数时可能出现的错误或异常，提高了代码的健壮性
---
 .../beforehand_order/BeforehandOrderLogic.php | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
index 4af6b1a40..50aaef5b4 100644
--- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
+++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
@@ -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;