状态统一修改

app/Http/Controllers/ConfigCityManagementController.php

@@ -51,11 +51,11 @@ class ConfigCityManagementController extends Controller
     }
 
 
-    //编辑城市
+    //编辑/新增城市
     public function edit(Request $request)
     {
         $validator = Validator::make($request->all(), [
-            'id' => 'required|exists:config_city_management',
+//            'id' => 'required|exists:config_city_management',
             'province_name' => 'required|string|max:20',
             'province_id' => 'required|integer',
             'city_id' => 'required|integer',

app/Http/Controllers/ConfigPickupNodeController.php

@@ -33,7 +33,7 @@ class ConfigPickupNodeController extends BaseController
 
                 $ConfigPickupNode[$k]->receive_type = $v->receive_type == 0 ? '信任交付' : '手动确认接货';
 
-                $ConfigPickupNode[$k]->status = $v->status == 0 ? '启用' : '禁用';
+                $ConfigPickupNode[$k]->status = $v->status == 0 ? '禁用' : '启用';
 
                 $ConfigPickupNode[$k]->store_ids = $v->getStoreNameAttribute();//储存方式名称
                 $ConfigPickupNode[$k]->pickup_group_id = $v->getGroupNameAttribute();//自提点分组名称
@@ -138,7 +138,7 @@ class ConfigPickupNodeController extends BaseController
 
                 $getPickup[$k]->receive_type = $v->receive_type == 0 ? '信任交付' : '手动确认接货';
 
-                $getPickup[$k]->status = $v->status == 0 ? '启用' : '禁用';
+                $getPickup[$k]->status = $v->status == 0 ? '禁用' : '启用';
 
                 $getPickup[$k]->store_ids = $v->getStoreNameAttribute();//储存方式名称
                 $getPickup[$k]->pickup_group_id = $v->getGroupNameAttribute();//自提点分组名称
@@ -178,4 +178,31 @@ class ConfigPickupNodeController extends BaseController
         return $data;
 
     }
+
+    //接货
+    public function pickupGoods(Request $request)
+    {
+        $validator = Validator::make($request->all(), [
+            'id' => 'required|exists:config_pickup_node'
+        ]);
+
+        if($validator->fails()) {
+            return $this->response->error($validator->errors()->first(), 500);
+        }
+        return  $this->configPickupNodeRepository->pickupGoods($request->all());
+    }
+
+    //给货
+    public function deliver_goods(Request $request)
+    {
+        $validator = Validator::make($request->all(), [
+            'id' => 'required|exists:config_pickup_node'
+        ]);
+
+        if($validator->fails()) {
+            return $this->response->error($validator->errors()->first(), 500);
+        }
+        return  $this->configPickupNodeRepository->deliver_goods($request->all());
+
+    }
 }

app/Repositories/ConfigCityManagementRepository.php

@@ -36,7 +36,7 @@ class ConfigCityManagementRepository {
         $configCity->city_id = $request['city_id'];
         $configCity->city_name = $request['city_name'];
         $configCity->express_type = $request['express_type'];
-        $configCity->status = 0;
+        $configCity->status = 1;
 
         DB::beginTransaction();
         try {

app/Repositories/ConfigPickupNodeRepository.php

@@ -48,7 +48,7 @@ class ConfigPickupNodeRepository {
             'latitude' => $request['latitude'],
             'store_ids' => $request['store_ids'],
             'pickup_group_id' => $request['pickup_group_id'],
-            'status' => 0
+            'status' => 1
         ];
 
         if (!$this->configPickupNode->create($data)) {
@@ -72,7 +72,7 @@ class ConfigPickupNodeRepository {
         $pickupNode->latitude = $request['latitude'];
         $pickupNode->store_ids = $request['store_ids'];
         $pickupNode->pickup_group_id = $request['pickup_group_id'];
-        $pickupNode->status = 0;
+        $pickupNode->status = 1;
 
         DB::beginTransaction();
         try{

database/migrations/2019_04_23_072002_create_table_config_city_management.php

@@ -19,8 +19,8 @@ class CreateTableConfigCityManagement extends Migration
             $table->integer('city_id');//城市ID
             $table->string('province_name',20);//省份名称
             $table->string('city_name',30);//城市名称
-            $table->tinyInteger('express_type')->default(0);//快递方式：0.快递；1.自提
-            $table->tinyInteger('status')->default(0);        //状态: 0.启用 1.停用
+            $table->tinyInteger('express_type')->default(0);//快递方式：0.全部；1.快递；2.自提
+            $table->tinyInteger('status')->default(1);        //状态: 0.禁用 1.启用
             $table->timestamps();
             $table->softDeletes();
         });

database/migrations/2019_04_23_072817_create_table_config_pickup_node.php

@@ -28,7 +28,7 @@ class CreateTableConfigPickupNode extends Migration
             $table->string('manager_name',50)->nullable();   //负责人
             $table->string('manager_mobile',20);  //负责人电话
             $table->tinyInteger('receive_type')->default(1);  // 接货方式：0.信任交付;1.手动确认接货
-            $table->tinyInteger('status')->default(0);        //状态: 0.启用；1.停用
+            $table->tinyInteger('status')->default(1);        //状态: 0.禁用；1.启用
             $table->timestamps();
         });
     }

database/migrations/2019_04_26_035256_update_express_type_config_city_management_table.php

@@ -14,7 +14,7 @@ class UpdateExpressTypeConfigCityManagementTable extends Migration
     public function up()
     {
         Schema::table('config_city_management', function (Blueprint $table) {
-            $table->string('express_type',50)->comment('快递方式：0.快递；1.自提')->change();
+            $table->string('express_type',50)->comment('快递方式：0.全选；1.快递；2.自提')->change();
         });
     }