RejectedBillController->disposeImportApi 将导入修改的原单单号改为订单号

app/Http/Controllers/RejectedBillController.php

@@ -320,7 +320,7 @@ class RejectedBillController extends Controller
          */
         $service = app('RejectedBillService');
         $rejectedBillItemService = app('RejectedBillItemService');
-        $params = [['logistic_number_return','logistic_number','fee_collected']];
+        $params = [['logistic_number_return','order_number','fee_collected']];
         $logistic_numbers = [];             // 原单单号
         $logistic_number_map = [];
         $logistic_number_return = [];       // 退回单号
@@ -351,8 +351,8 @@ class RejectedBillController extends Controller
         $rejectedBill_collect = collect();
 
         // 对已用的进行修改
-        $update_fee_params = [['id','logistic_number','fee_collected']];                //对原有的进行修改 有到付费用
-        $update_params = [['id','logistic_number']];                                    // 无到付费用
+        $update_fee_params = [['id','order_number','fee_collected']];                //对原有的进行修改 有到付费用
+        $update_params = [['id','order_number']];                                    // 无到付费用
         $exist_picktotraceid = [];                                                      // 已有退回单号
         $rejectedBills = RejectedBill::query()->whereIn('logistic_number_return',$logistic_number_return)->get();
         $rejectedBills->each(function($rejectedBill)use(&$update_fee_params,&$update_params,$logistic_number_return_map,&$exist_picktotraceid,&$rejectedBill_collect){
@@ -361,9 +361,9 @@ class RejectedBillController extends Controller
             $params = $logistic_number_return_map[$logistic_number_return];
             $rejectedBill->logistic_number ? $exist_picktotraceid[$rejectedBill->logistic_number] = $rejectedBill->logistic_number : null;    // 记录已有原单单号
             if(isset($params[2])){
-                $update_fee_params[] = ['id'=>$rejectedBill->id,'logistic_number'=>$params[1],'fee_collected'=>$params[2]];
+                $update_fee_params[] = ['id'=>$rejectedBill->id,'order_number'=>$params[1],'fee_collected'=>$params[2]];
             }else if(isset($params[1])){
-                $update_params[] = ['id'=>$rejectedBill->id,'logistic_number'=>$params[1]];
+                $update_params[] = ['id'=>$rejectedBill->id,'order_number'=>$params[1]];
             }
         });
         // 对不存在的进行创建
@@ -390,9 +390,9 @@ class RejectedBillController extends Controller
                     'logistic_number_return' => $logistic_number_map[$key][0] ?? '',
                     'id_logistic_return' =>$logistic->id ?? '',
                     'fee_collected' => $logistic_number_map[$key][2] ?? '',
-                    'order_number' =>$order_header->soreference1,
+//                    'order_number' =>$order_header->soreference1,
                     'mobile_sender' => empty($order_header->c_tel2)?$order_header->c_tel1:$order_header->c_tel2,
-                    'logistic_number' => $logistic_number_map[$key][1] ?? '',
+                    'order_number' => $logistic_number_map[$key][1] ?? '',
                     'remark' => $order_header->notes,
                     'is_loaded' =>0,
                     "id_operator" => Auth::id(),