duqinya 6 gadi atpakaļ
vecāks
revīzija
02d250adf6

+ 2 - 0
app/Http/Controllers/ConfigCityManagementController.php

@@ -7,6 +7,7 @@ use Illuminate\Support\Facades\Validator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection;
 use League\Fractal\Resource\Collection;
 use League\Fractal\Manager;
 use League\Fractal\Manager;
+use Illuminate\Validation\Rule;
 /**
 /**
  * Created by PhpStorm.
  * Created by PhpStorm.
  * User: qinyaer
  * User: qinyaer
@@ -75,6 +76,7 @@ class ConfigCityManagementController extends Controller
             'province_name' => 'required|string|max:20',
             'province_name' => 'required|string|max:20',
             'province_id' => 'required|integer',
             'province_id' => 'required|integer',
             'city_id' => 'required|integer',
             'city_id' => 'required|integer',
+            'express_type' => ['required', Rule::in(0,1)],
             'city_name' => 'required|string|max:30',
             'city_name' => 'required|string|max:30',
         ]);
         ]);
 
 

+ 4 - 2
app/Repositories/ConfigPickupNodeRepository.php

@@ -41,13 +41,14 @@ class ConfigPickupNodeRepository {
             'city_name' => $request['city_name'],
             'city_name' => $request['city_name'],
             'address' => $request['address'],
             'address' => $request['address'],
             'work_time' => $request['work_time'],
             'work_time' => $request['work_time'],
-            'manager_name' => $request['manager_name'],
+            'manager_name' => $request['manager_name']??'',
             'manager_mobile' => $request['manager_mobile'],
             'manager_mobile' => $request['manager_mobile'],
             'receive_type' => $request['receive_type'],
             'receive_type' => $request['receive_type'],
             'longitude' => $request['longitude'],
             'longitude' => $request['longitude'],
             'latitude' => $request['latitude'],
             'latitude' => $request['latitude'],
             'store_ids' => $request['store_ids'],
             'store_ids' => $request['store_ids'],
             'pickup_group_id' => $request['pickup_group_id'],
             'pickup_group_id' => $request['pickup_group_id'],
+            'distance' => $request['distance']??'',
             'status' => 0
             'status' => 0
         ];
         ];
 
 
@@ -65,13 +66,14 @@ class ConfigPickupNodeRepository {
         $pickupNode->city_name = $request['city_name'];
         $pickupNode->city_name = $request['city_name'];
         $pickupNode->address = $request['address'];
         $pickupNode->address = $request['address'];
         $pickupNode->work_time = $request['work_time'];
         $pickupNode->work_time = $request['work_time'];
-        $pickupNode->manager_name = $request['manager_name'];
+        $pickupNode->manager_name = $request['manager_name']??'';
         $pickupNode->manager_mobile = $request['manager_mobile'];
         $pickupNode->manager_mobile = $request['manager_mobile'];
         $pickupNode->receive_type = $request['receive_type'];
         $pickupNode->receive_type = $request['receive_type'];
         $pickupNode->longitude = $request['longitude'];
         $pickupNode->longitude = $request['longitude'];
         $pickupNode->latitude = $request['latitude'];
         $pickupNode->latitude = $request['latitude'];
         $pickupNode->store_ids = $request['store_ids'];
         $pickupNode->store_ids = $request['store_ids'];
         $pickupNode->pickup_group_id = $request['pickup_group_id'];
         $pickupNode->pickup_group_id = $request['pickup_group_id'];
+        $pickupNode->distance = $request['distance']??'';
         $pickupNode->status = 0;
         $pickupNode->status = 0;
 
 
         DB::beginTransaction();
         DB::beginTransaction();