1

app/Service/ConstructionService.php

@@ -550,8 +550,14 @@ class ConstructionService extends Service
     }
 
     public function getSaveReturnCompareMessage($id = 0, $sales_order_id = 0){
+        $construction = Construction::where('del_time',0)
+            ->where('sales_order_id',$sales_order_id)
+            ->select('id')->get()->toArray();
+        $construction_id = array_column($construction,'id');
+
         $product_save = [];
         $sub = ConstructionProductInfo::where('del_time',0)
+            ->whereIn('construction_id',$construction_id)
             ->when(! empty($id), function ($query) use ($id) {
                 return $query->where('construction_id', '<>',$id);
             })

app/Service/ReturnExchangeOrderService.php

@@ -48,6 +48,7 @@ class ReturnExchangeOrderService extends Service
                         'basic_type_id' => $value['basic_type_id'],
                         'price' => $value['price'],
                         'final_amount' => $value['final_amount'] ?? 0,
+                        'return_exchange_price' => $value['return_exchange_price'],
                     ];
                 }
                 ReturnExchangeOrderProductInfo::insert($sub);
@@ -150,6 +151,7 @@ class ReturnExchangeOrderService extends Service
                         'basic_type_id' => $value['basic_type_id'],
                         'price' => $value['price'],
                         'final_amount' => $value['final_amount'] ?? 0,
+                        'return_exchange_price' => $value['return_exchange_price'],
                     ];
                 }
                 ReturnExchangeOrderProductInfo::insert($sub);
@@ -456,9 +458,14 @@ class ReturnExchangeOrderService extends Service
     }
 
     public function getSaveReturnCompareMessage($id = 0, $sales_order_id = 0){
+        $return = ReturnExchangeOrder::where('del_time',0)
+            ->where('sales_order_id',$sales_order_id)
+            ->select('id')->get()->toArray();
+        $return = array_column($return,'id');
         $product_save = [];
         $sub = ReturnExchangeOrderProductInfo::where('return_or_exchange',ReturnExchangeOrderProductInfo::type_one)
             ->where('del_time',0)
+            ->whereIn('return_exchange_id',$return)
             ->when(! empty($id), function ($query) use ($id) {
                 return $query->where('return_exchange_id', '<>',$id);
             })