1

app/Service/SalesOrderService.php

@@ -136,17 +136,17 @@ class SalesOrderService extends Service
                 $insert = [];
                 foreach ($data['product'] as $value){
                     $sports_bag_product_info_id = 0;
-                    if(! empty($value['sports_bag_id'])) $sports_bag_product_info_id = $value['id'];
+                    if(! empty($value['sports_bag_id'])) $sports_bag_product_info_id = empty($value['id']) ? 0 : $value['id'];
                     $insert[] = [
                         'sales_order_id' => $model->id,
-                        'product_id' => $value['product_id'],
-                        'number' => $value['number'],
+                        'product_id' => $value['product_id'] ?? 0,
+                        'number' => $value['number'] ?? 0,
                         'cost' => $value['cost'] ?? 0,
                         'retail_price' => $value['retail_price'] ?? 0,
                         'mark' => $value['mark'] ?? '',
                         'crt_time' => $time,
                         'basic_type_id' => $value['basic_type_id'],
-                        'price' => $value['price'],
+                        'price' => $value['price'] ?? 0,
                         'final_amount' => $value['final_amount'] ?? 0,
                         'sports_bag_id' => $value['sports_bag_id'] ?? 0,
                         'sports_bag_product_info_id' => $sports_bag_product_info_id,
@@ -275,17 +275,17 @@ class SalesOrderService extends Service
                 $insert = [];
                 foreach ($data['product'] as $value){
                     $sports_bag_product_info_id = 0;
-                    if(! empty($value['sports_bag_id'])) $sports_bag_product_info_id = $value['id'];
+                    if(! empty($value['sports_bag_id'])) $sports_bag_product_info_id = empty($value['id']) ? 0 : $value['id'];;
                     $insert[] = [
                         'sales_order_id' => $model->id,
-                        'product_id' => $value['product_id'],
-                        'number' => $value['number'],
+                        'product_id' => $value['product_id'] ?? 0,
+                        'number' => $value['number'] ?? 0,
                         'cost' => $value['cost'] ?? 0,
                         'retail_price' => $value['retail_price'] ?? 0,
                         'mark' => $value['mark'] ?? '',
                         'crt_time' => $time,
-                        'basic_type_id' => $value['basic_type_id'],
-                        'price' => $value['price'],
+                        'basic_type_id' => $value['basic_type_id'] ?? 0,
+                        'price' => $value['price'] ?? 0,
                         'final_amount' => $value['final_amount'] ?? 0,
                         'sports_bag_id' => $value['sports_bag_id'] ?? 0,
                         'sports_bag_product_info_id' => $sports_bag_product_info_id,
@@ -501,6 +501,7 @@ class SalesOrderService extends Service
             ->select('title','id','sales_order_type','model_type','order_number','selling_price','vin_no','car_type','order_type','deal_type','customer_id','sign_time','contract_state','crt_id','crt_time','mark','product_total','rate','construction_time','handover_time','expire_time','other_fee','discount_fee','contract_fee','contract_type','pay_way','send_state','logistics_company','logistics_number','car_type','year','mileage','color','original_set','processing','state')
             ->orderby('id', 'desc');
 
+        if(! empty($data['order_number'])) $model->where('order_number','LIKE', '%'.$data['order_number'].'%');
         if(! empty($data['sales_order_type'])) $model->where('sales_order_type',$data['sales_order_type']);
         if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
         if(! empty($data['model_type'])) $model->where('model_type',$data['model_type']);

routes/wx.php

@@ -53,6 +53,9 @@ Route::group(['middleware'=> ['checkWx']],function ($route){
     $route->any('productList', 'Api\ProductController@productList');
     $route->any('supplierList', 'Api\SupplierController@customerList');
     $route->any('customerList', 'Api\CustomerController@customerList');
+    $route->any('sportsBagOrderList', 'Api\SportsBagController@orderList');
+    $route->any('productAdd', 'Api\ProductController@productAdd');
+    $route->any('productCategoryList', 'Api\ProductController@productCategoryList');
 
     //退换货
     $route->any('ReturnExchangeOrderList', 'Api\ReturnExchangeOrderController@ReturnExchangeOrderList');