1

app/Service/SalesOrderService.php

@@ -682,7 +682,7 @@ class SalesOrderService extends Service
             ->pluck('title','id')
             ->toArray();
 
-        $product = $fee = [];
+        $product = [];
         if(! empty($ergs['product'])){
             $sales_p_info = SalesOrderProductInfo::where('del_time',0)
                 ->whereIn('sales_order_id',array_column($data['data'],'id'))
@@ -701,12 +701,6 @@ class SalesOrderService extends Service
                 $value['install_time'] = $tmp['install_time'] ?? 0;
                 $product[$value['sales_order_id']][] = $value;
             }
-            $sales_o_info = SalesOrderOtherFee::where('del_time',0)
-                ->where('sales_order_id',array_column($data['data'],'id'))
-                ->get()->toArray();
-            foreach ($sales_o_info as $value){
-                $fee[$value['sales_order_id']][] = $value;
-            }
         }
 
         //获取分社订货合同关联的发货单
@@ -717,6 +711,15 @@ class SalesOrderService extends Service
 
         //获取金额列表
         $money = (new BookingListService())->getAllAmount(array_column($data['data'],'id'), BookingList::data_type_one);
+
+        //指派金额
+        $fee = [];
+        $sales_o_info = SalesOrderOtherFee::where('del_time',0)
+            ->whereIn('sales_order_id',array_column($data['data'],'id'))
+            ->get()->toArray();
+        foreach ($sales_o_info as $value){
+            $fee[$value['sales_order_id']][] = $value;
+        }
         foreach ($data['data'] as $key => $value){
             $data['data'][$key]['sales_order_type_title'] = SalesOrder::$order_type[$value['sales_order_type']] ?? '';
             $data['data'][$key]['model_type_title'] = SalesOrder::$model_type_title[$value['model_type']] ?? '';