状态统一修改

app/Helper/helper.php

@@ -42,4 +42,49 @@ function verifySign($sign, $params, $secret_key)
         return false;
     };
 
+
 }
+
+     function jsonSuccess($data = [], $msg = "成功")
+    {
+        $response = array(
+            'code' => 0,
+            'msg' => $msg,
+            'data' => []
+        );
+        if ($data) {
+            if (is_array($data)) {
+                //带有分页格式转换
+                if (isset($data['meta'])) {
+                    // 更改元数据格式，全部包含在data下
+                    $temp = array(
+                        'data' => array(
+                            'data' => $data['data'],
+                            'pagination' => $data['meta']['pagination']
+                        )
+                    );
+                    $response = array_merge($response, $temp);
+                } elseif(isset($data['data'])) {
+                    $response = array_merge($response, $data);
+                }else{
+                    $temp = array(
+                        'data' => $data
+                    );
+                    $response = array_merge($response, $temp);
+                }
+            } else {
+                $response['data'] = $data;
+            }
+        }
+        return $response;
+    }
+
+        function jsonError($msg)
+        {
+            $response = array(
+                'code' => 1,
+                'msg' => $msg,
+                'data' => ""
+            );
+            return $response;
+        }

app/Http/Controllers/ConfigPickupNodeController.php

@@ -34,7 +34,7 @@ class ConfigPickupNodeController extends BaseController
             foreach ($configPickupNode as $k => $v) {
                 $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();//自提点分组名称
@@ -68,7 +68,7 @@ class ConfigPickupNodeController extends BaseController
             return $this->jsonError($validator->errors()->first());
         }
         $getPickup->receive_type = $getPickup->receive_type == 0 ? '信任交付':'手动确认接货';
-        $getPickup->status = $getPickup->status == 0 ? '启用':'禁用';
+        $getPickup->status = $getPickup->status == 0 ? '禁用':'启用';
         $getPickup->store_ids = $getPickup->getStoreNameAttribute();
         $getPickup->pickup_group_id = $getPickup->getGroupNameAttribute();
 

app/Repositories/ConfigCityManagementRepository.php

@@ -19,11 +19,11 @@ class ConfigCityManagementRepository
 
             $this->configCityManagement = $this->configCityManagement
                 ->orderBy('id', 'desc')
-                ->where(['status' => 0,'city_id' => $request['city_id']]);
+                ->where(['status' => 1,'city_id' => $request['city_id']]);
         }else{
             $this->configCityManagement = $this->configCityManagement
                 ->orderBy('id', 'desc')
-                ->where('status',0);
+                ->where('status',1);
         }
 
             return $this->configCityManagement->paginate($perPage);

app/Repositories/ConfigPickupNodeRepository.php

@@ -22,12 +22,12 @@ class ConfigPickupNodeRepository
                 ->orderBy('id', 'desc')
                 ->where('city_id', $request['city_id'])
                 ->where(function ($query) use ($request) {
-                        $query->where('status', 0)
+                        $query->where('status', 1)
                         ->orWhere('name', 'like', "{$request['keyword']}%");
                 });
         }else{
             $this->configPickupNode = $this->configPickupNode
-                ->orderBy('id', 'desc')->where(['status' => 0,'city_id' => $request['city_id']]);
+                ->orderBy('id', 'desc')->where(['status' => 1,'city_id' => $request['city_id']]);
         }
             return $this->configPickupNode->paginate($perPage);
 

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_30_095318_delete_city_code_to_config_province_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DeleteCityCodeToConfigProvinceTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('config_province', function (Blueprint $table) {
+            $table->dropColumn('city_code');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('config_province', function (Blueprint $table) {
+            //
+        });
+    }
+}