2

app/Service/CheckService.php

@@ -733,11 +733,11 @@ class CheckService extends Service
 
     public function recordReturnExchangeOrder($data, $order){
         if($order['model_type'] == ReturnExchangeOrder::Model_type_three) return [true, self::minus_one];
-//        if($order['type'] == ReturnExchangeOrder::Order_type){
-//            //快递件不记录流水
-//            $sales_order_type = SalesOrder::where('id',$order['data_id'])->value('sales_order_type');
-//            if($sales_order_type == SalesOrder::Order_type_two) return [true, self::minus_one];
-//        }
+        if($order['type'] == ReturnExchangeOrder::Order_type){
+            //快递件不记录流水
+            $sales_order_type = SalesOrder::where('id',$order['data_id'])->value('sales_order_type');
+            if($sales_order_type == SalesOrder::Order_type_two) return [true, self::minus_one];
+        }
 
         $result = ReturnExchangeOrderProductInfo::where('del_time',0)
             ->where('return_exchange_id',$order['id'])
@@ -1033,11 +1033,11 @@ class CheckService extends Service
 
     public function reject_record_return_exchange($data,$order){
         if($order['model_type'] == ReturnExchangeOrder::Model_type_three) return [true, self::minus_one];
-//        if($order['type'] == ReturnExchangeOrder::Order_type){
-//            //快递件不记录流水
-//            $sales_order_type = SalesOrder::where('id',$order['data_id'])->value('sales_order_type');
-//            if($sales_order_type == SalesOrder::Order_type_two) return [true, self::minus_one];
-//        }
+        if($order['type'] == ReturnExchangeOrder::Order_type){
+            //快递件不记录流水
+            $sales_order_type = SalesOrder::where('id',$order['data_id'])->value('sales_order_type');
+            if($sales_order_type == SalesOrder::Order_type_two) return [true, self::minus_one];
+        }
 
         $result = ReturnExchangeOrderProductInfo::where('del_time',0)
             ->where('return_exchange_id',$order['id'])