问题件导出修改

缺少字段：退回单号
缺少内容：退货商品，数量

app/Http/Controllers/OrderIssueController.php

@@ -624,16 +624,16 @@ class OrderIssueController extends Controller
         $row = [
             '登记日期','创建日期','客户','客户订单号','原始承运商','收货人','收货电话','省','市','区','收货人地址',
             '原始运单号','原始商品','原始商品名称','原始商品数量',
-            '退单备注','退单商品名','退单商品条码','退单商品数量','退单状态',
+            '退回单号', '退单商品名','退单商品条码','退单商品数量','是否正品','退单状态','退单备注',
             '操作类型','说明','操作者','情况说明','问题类别',
             '二次订单号','二次承运商','二次运单号','二次商品条码','二次商品名','二次商品数量',
             '最终状态', '承运商赔偿金额', '承运商快递减免', '宝时赔偿金额', '宝时快递减免','事故责任方'
         ];
         foreach ($order_Issues as $order_issue){
             $order =  $order_issue->order;
-            $orderPacakges = $order_issue->order->packages ?? collect();
+            $orderPackages = $order_issue->order->packages ?? collect();
             $logistic_numbers = '';$order_sku  = '';$order_sku_name  = '';$order_sku_amount  = '';
-            $orderPacakges->each(function($package,$index)use(&$logistic_numbers,&$order_sku,&$order_sku_name,&$order_sku_amount){
+            $orderPackages->each(function($package,$index)use(&$logistic_numbers,&$order_sku,&$order_sku_name,&$order_sku_amount){
                 if(!str_starts_with('null',$package->logistic_number))$logistic_numbers.=$package->logistic_number.",\r\n";
                 $package->commodities->each(function($commodities)use(&$order_sku,&$order_sku_name,&$order_sku_amount){
                     $commodity = $commodities->commodity ?? '';
@@ -642,16 +642,19 @@ class OrderIssueController extends Controller
                     $order_sku_amount.= ($commodities->amount ?? '').",\r\n";
                 });
             });
-            $rejected_Bill_remark = $order_issue->rejectedBill->remark ?? '';
+            $rejected_logistic_number = $order_issue->rejectedBill->logistic_number_return;
+            $rejected_Bill_remark = '';
+            $rejected_is_checked = '';
             $rejected_name = ''; $rejected_barcode = '';$rejected_amount = '';
             if($order_issue->rejectedBill){
-                $order_issue->rejectedBill->items(function($item)use(&$rejected_name,&$rejected_barcode, &$rejected_amount){
+                $order_issue->rejectedBill->items->each(function($item)use(&$rejected_name,&$rejected_barcode, &$rejected_amount,&$rejected_Bill_remark,&$rejected_is_checked){
                     $rejected_name.= $item->name_goods.",\r\n";
                     $rejected_barcode.= $item->barcode_goods.",\r\n";
                     $rejected_amount.= $item->amount.",\r\n";
+                    $rejected_Bill_remark.= $item->remark.",\r\n";
+                    $rejected_is_checked.= $item->quality->name.",\r\n";
                 });
             }
-
             $log_type = ''; $log_content = '';$log_user = '';
             $order_issue->logs->each(function($log)use(&$log_type, &$log_content,&$log_user){
                 $log_type.=$log->type.",\r\n";
@@ -688,11 +691,14 @@ class OrderIssueController extends Controller
                 rtrim($order_sku_name,",\r\n"),                //原始商品名称
                 rtrim($order_sku_amount,",\r\n"),              //原始商品数量
 
-                //'退单备注','退单商品名','退单商品条码','退单商品数量','退单状态',
-                rtrim($rejected_Bill_remark,",\r\n"),                                          // 退单备注
+                //,'退单商品名','退单商品条码','退单商品数量','退单状态','退单备注'
+                $rejected_logistic_number,                      //退回单号
                 rtrim($rejected_name,",\r\n"),        // 退单商品名
                 rtrim($rejected_barcode,",\r\n") ,    // 退单商品条码
                 rtrim($rejected_amount,",\r\n"),      // 退单商品数量
+                rtrim($rejected_is_checked,",\r\n"),  // 是否正品
+                rtrim($rejected_Bill_remark,",\r\n"),   // 退单备注
+
                 $order_issue->rejecting_status ,                                // 退单状态
 
                 // '操作类型','情况说明','问题类别',

app/Services/OrderIssueService.php

@@ -48,7 +48,7 @@ class OrderIssueService
                 $query->with('barcodes');
             }]);
         }, 'rejectedBill' => function ($query) {
-            $query->with(['items']);
+            $query->with(['items.quality']);
         }, 'secondOrder' => function ($query) {
             $query->with(['shop', 'logistic', 'owner', 'packages.commodities.commodity' => function ($query) {
                 $query->with('barcodes');