1

api/CityPackage.proto

@@ -7,8 +7,12 @@ import "google/protobuf/descriptor.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "api/EntCityPackage.proto";
 import "api/Common.proto";
+import "api/EntCommon.proto";
 import "api/EntCarModel.proto";
 import "api/EntArea.proto";
+import "api/EntTag.proto";
+import "api/EntPackage.proto";
+import "api/EntAdmin.proto";
 
 option go_package = "api/v1";
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
@@ -61,6 +65,14 @@ service CityPackageService {
     };
   };
 
+  // 套餐的推荐变更
+  rpc ChangeRecommend(ChangeRecommendReq) returns (ChangeRecommendRes) {
+    option (google.api.http) = {
+        post : "/cityPackage/city-package/change-recommend",
+        body : "*",
+    };
+  };
+
   // --------------------------------订单-------------------------------------------
 
   // 订单列表
@@ -74,82 +86,145 @@ service CityPackageService {
 
   // -------------------------------- 车辆型号 -------------------------------------------
 
-  // 添加车辆型号
-  rpc CarModelAdd(CarModelAddReq) returns (CarModelAddRes) {
-    option (google.api.http) = {
-        post : "/cityPackage/car-model/car-model-add",
-        body : "*",
-    };
-  };
+  //// 添加车辆型号
+  //rpc CarModelAdd(CarModelAddReq) returns (CarModelAddRes) {
+  //  option (google.api.http) = {
+  //      post : "/cityPackage/car-model/car-model-add",
+  //      body : "*",
+  //  };
+  //};
+
+  //// 车辆型号列表
+  //rpc CarModelList(CarModelListReq) returns (CarModelListRes) {
+  //  option (google.api.http) = {
+  //      post : "/cityPackage/car-model/car-model-list",
+  //      body : "*",
+  //  };
+  //}
+
+  //// 删除车辆型号
+  //rpc CarModelDelete(CarModelDeleteReq) returns (CarModelDeleteRes) {
+  //  option (google.api.http) = {
+  //      post : "/cityPackage/car-model/car-model-delete",
+  //      body : "*",
+  //  };
+  //}
 
-  // 车辆型号列表
-  rpc CarModelList(CarModelListReq) returns (CarModelListRes) {
-    option (google.api.http) = {
-        post : "/cityPackage/car-model/car-model-list",
-        body : "*",
-    };
-  }
+  // --------------------------------标签-------------------------------------------
+
+  // 添加标签
+  //rpc AddTag(AddTagReq) returns (AddTagRes) {
+  //  option (google.api.http) = {
+  //      post : "/cityPackage/tag/add-tag",
+  //      body : "*",
+  //  };
+  //}
 
-  // 删除车辆型号
-  rpc CarModelDelete(CarModelDeleteReq) returns (CarModelDeleteRes) {
+  // -------------------------------- 地区管理 -------------------------------------------
+  
+  // 主体门店开通的地区列表
+  rpc AreaList(AreaListReq) returns (AreaListRes) {
     option (google.api.http) = {
-        post : "/cityPackage/car-model/car-model-delete",
+        post : "/cityPackage/area/area-list",
         body : "*",
     };
   }
 
-  // --------------------------------标签-------------------------------------------
-
-  // 添加标签
-  rpc AddTag(AddTagReq) returns (AddTagRes) {
+    // 主体门店编辑地区
+    rpc OpenArea(OpenAreaReq) returns (OpenAreaRes) {
+      option (google.api.http) = {
+          post : "/cityPackage/area/open-area",
+          body : "*",
+      };
+    }
+  
+    // 主体门店停用地区
+    rpc CloseArea(CloseAreaReq) returns (CloseAreaRes) {
+      option (google.api.http) = {
+          post : "/cityPackage/area/close-area",
+          body : "*",
+      };
+    }
+
+  // 子门店可选的地区列表
+  rpc SubAreaList(SubAreaListReq) returns (SubAreaListRes) {
     option (google.api.http) = {
-        post : "/cityPackage/tag/add-tag",
+        post : "/cityPackage/area/sub-area-list",
         body : "*",
     };
   }
 
-  // -------------------------------- 地区管理 -------------------------------------------
-  
-  // 地区列表
-  rpc AreaList(AreaListReq) returns (AreaListRes) {
+  // 子门店选择地区
+  rpc SubSelectArea(SubSelectAreaReq) returns (SubSelectAreaRes) {
     option (google.api.http) = {
-        post : "/cityPackage/area/area-list",
+        post : "/cityPackage/area/sub-select-area",
         body : "*",
     };
   }
 
-  // 层级关系的所有地区列表
-  rpc AllAreaLevelList(AllAreaLevelListReq) returns (AllAreaLevelListRes) {
+  // 子门店移除地区
+  rpc SubRemoveArea(SubRemoveAreaReq) returns (SubRemoveAreaRes) {
     option (google.api.http) = {
-        post : "/cityPackage/area/all-area-level-list",
+        post : "/cityPackage/area/sub-remove-area",
         body : "*",
     };
   }
 
-  // 开通地区
-  rpc OpenArea(OpenAreaReq) returns (OpenAreaRes) {
+  // 子门店列表
+  rpc SubShopList(SubShopListReq) returns (SubShopListRes) {
     option (google.api.http) = {
-        post : "/cityPackage/area/open-area",
+        post : "/cityPackage/area/sub-shop-list",
         body : "*",
     };
   }
 
-  // 关闭地区
-  rpc CloseArea(CloseAreaReq) returns (CloseAreaRes) {
+  // 获取层级关系的树形结构地区数据  只有省和市两级
+  rpc AllAreaLevelList(AllAreaLevelListReq) returns (AllAreaLevelListRes) {
     option (google.api.http) = {
-        post : "/cityPackage/area/close-area",
+        post : "/cityPackage/area/all-area-level-list",
         body : "*",
     };
   }
-
-
 }
 
 message CityPackageAddReq {
+  message AddItem{
+     // 套餐名称
+     string name = 1;
+     // 套餐类型
+     PackageType type = 2;
+     // 押金
+     int32 pledge = 3; 
+     // 天数
+     int32 total_day = 4;
+     // 次数
+     int32 total_num = 5;
+     // 套餐显示价格
+     int32 show_money = 6;
+     // 套餐实际价格，元
+     int32 money = 7;
+     // 单次换电价格，元
+     int32 exchange_money = 8;
+     // 购买限制数量
+     int32 buy_limit = 9;
+     // 上下架状态
+     LISTED_STATUS listed_status = 10;
+     // 库存
+     int32 stock = 12;
+     
+     // 套餐分类 1租电套餐 2车电一体 3租车套餐
+     DEVICE_USE_TYPE package_category = 13;
+     // 支持的区县ID列表
+     repeated AreaEnt area_list = 14;
+     // 电池标签信息
+     EntTag battery_tag_info = 15;
+     // 车型信息
+     CarModelEnt car_model_info = 16;
+  }
   // 门店ID 默认为当前登陆的门店ID
   int32 shop_id = 1;
   // 套餐数组列表
-  repeated CityPackageEnt package_list = 2;
+  repeated AddItem package_list = 2;
   // 套餐分类 1租电套餐 2车电一体 3租车套餐
   DEVICE_USE_TYPE package_category = 3;
 }
@@ -256,16 +331,12 @@ message ChangeListedStatusRes {
 message AreaListReq {
   // 分页参数
   PageArg page_arg = 1;
-  // 筛选参数
-  PackageAreaEnt package_area_arg = 2;
-  // 子门店查询 默认false
-  bool is_child_query = 3;
-  // 最小层级 1省级  2市级  3县级
-  int32 min_level = 4;
-  // 查询的层级
-  int32 level = 5;
-  // 门店
-  int32 admin_id = 6;
+  // 开通状态
+  YES_NO open_status = 2;
+  // 省份CODE
+  string province_code = 3;
+  // 城市CODE
+  string city_code = 4;
 }
 message AreaListRes {
   // 总条数
@@ -275,10 +346,20 @@ message AreaListRes {
 }
 
 message OpenAreaReq {
-  // 地区CODE列表
-  repeated string area_ids = 1;
-  // 是否子门店操作开通 默认false
-  bool is_child_opt = 3;
+  message OpenItem{
+    // 选择区域的id
+    string area_id = 1;
+    // 电池押金
+    int32 battery_deposit = 2;
+    // 车辆押金
+    int32 car_deposit = 3;
+    // 车电一体押金
+    int32 battery_car_deposit = 4;
+    // 开通状态
+    YES_NO open_status = 5;
+  }
+  // 开通的地区
+  repeated OpenItem list = 1;
 }
 
 message OpenAreaRes {
@@ -287,24 +368,104 @@ message OpenAreaRes {
 message CloseAreaReq {
   // 地区CODE列表
   repeated string area_ids = 1;
-  // 是否子门店操作关闭 默认false
-  bool is_child_opt = 3;
 }
 message CloseAreaRes {
 }
 
-
-message AllAreaLevelListReq {
-}
-message AllAreaLevelListRes {
-  // 省列表
-  AreaLevelEnt list = 1;
-}
-
 message EditPackageReq {
     // 套餐数据
     CityPackageEnt data = 1;
 
 }
 message EditPackageRes {
+}
+
+message ChangeRecommendReq{
+  // 套餐code
+  repeated string package_code = 1;
+  // 是否推荐
+  YES_NO is_recommend = 2;
+}
+message ChangeRecommendRes {
+}
+
+message SubSelectAreaReq{
+  // 门店ID
+  int32 shop_id = 1;
+  // 地区area_ids
+  repeated string area_ids = 2;
+}
+message SubSelectAreaRes {
+  
+}
+
+message SubRemoveAreaReq{
+  // 门店ID
+  int32 shop_id = 1;
+  // 地区area_ids
+  repeated string area_ids = 2;
+}
+message SubRemoveAreaRes{}
+
+message SubAreaListReq {
+    // 分页参数
+    PageArg page_arg = 1;
+    // 省份CODE
+    string province_code = 2;
+    // 城市CODE
+    string city_code = 3;
+    // 门店ID
+    int32 shop_id = 4;
+}
+message SubAreaListRes {
+  message SubItem {
+    // 省份
+    string province_name = 2;
+    // 城市
+    string city_name = 3;
+    // 电池押金
+    int32 battery_deposit = 4;
+    // 车辆押金
+    int32 car_deposit = 5;
+    // 车电一体押金
+    int32 battery_car_deposit = 6;
+  }
+  // 总条数
+  int32 total = 1;
+  // 列表
+  repeated SubItem list = 2;
+}
+
+message SubShopListReq {
+  // 分页参数
+  PageArg page_arg = 1;
+}
+message SubShopListRes {
+  message SubShopListResItem {
+    // 门店信息
+    AdminBaseInfo shop_info = 1;
+    // 省份
+    string province_name = 2;
+    // 城市
+    string city_name = 3;
+    // 电池押金
+    int32 battery_deposit = 4;
+    // 车辆押金
+    int32 car_deposit = 5;
+    // 车电一体押金
+    int32 battery_car_deposit = 6;
+    // 选择的城市列表
+    repeated string area_ids = 7;
+  }
+  // 总条数
+  int32 total = 1;
+  // 门店列表
+  repeated SubShopListResItem list = 2;
+}
+
+message AllAreaLevelListReq {
+}
+message AllAreaLevelListRes {
+  // 省列表
+  AreaLevelEnt list = 1;
 }

api/CityPackageMicroSoft.proto

@@ -88,7 +88,12 @@ message DetailPackageMicroSoftRes {
 }
 
 message PreBuyMicroSoftReq{
-  CityPackageOrderEnt data = 1;
+  // 套餐编号
+  string package_code = 1;
+  // 购买数量
+  int32 buy_num = 2;
+  // 支付方式
+  PAY_METHOD pay_method = 3;
 }
 message PreBuyMicroSoftRes {
 }

api/EntCityPackage.proto

@@ -29,8 +29,20 @@ message CityPackageTagEnt{
 
 // 城市套餐订单实体
 message CityPackageOrderEnt {
-  // 基本订单信息
-  EntOrder order_info = 1;
+  message OrderInfoItem{
+    // 基础信息
+    EntOrder base_info = 1;
+    // 当前电池
+    string current_battery_sn = 2;
+    // 购买绑定的电池
+    string battery_sn = 3;
+    // 剩余用量
+    string remain_capacity = 4;
+    // 押金状态 0待支付，1已支付，2免押，3无需支付 4 押金已退
+    int32 pledge_status = 5;
+  }
+  // 订单信息
+  OrderInfoItem order_info = 1;
   // 保险信息
   string insurance_info = 2;
   // 城市套餐信息
@@ -51,6 +63,8 @@ message CityPackageEnt {
   CarModelEnt car_model_info = 5;
   // 门店信息
   EntAdmin shop_info = 6;
+  // 是否是推荐
+  YES_NO is_recommend = 7;
 }
 
 // 套餐开通的地区
@@ -59,10 +73,4 @@ message PackageAreaEnt {
   AreaEnt area_info = 1;
   // 开通状态
   YES_NO open_status = 2;
-  // 是否可以选中
-  bool is_can_select = 3;
-  // 是否已经选中
-  bool is_selected = 4;
-  // 子级门店
-  repeated PackageAreaEnt children = 5;
 }

api/EntCommon.proto

@@ -14,8 +14,8 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
 enum YES_NO {
     // 保留
     YES_NO_RESERVED = 0;
-    // 是/开通/真/拥有/有效
+    // 是/开通/真/拥有/有效/推荐
     YES = 1;
-    // 否/关闭/假/不拥有/无效
+    // 否/关闭/假/不拥有/无效/不推荐
     NO = 2;
 }

api/EntOrder.proto

@@ -72,4 +72,6 @@ message EntOrder {
     PAY_METHOD pay_method = 6;
     // 订单来源
     REQUEST_SOURCE order_source = 7;
+    // 支付状态
+    int32 pay_status = 8;
 }

gen/php/GPBMetadata/Api/EntCityPackage.php

@@ -25,7 +25,7 @@ class EntCityPackage
         \GPBMetadata\Api\EntAdmin::initOnce();
         \GPBMetadata\Api\EntCarModel::initOnce();
         $pool->internalAddGeneratedFile(
-            "\x0A\xC6\x07\x0A\x18api/EntCityPackage.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\x1A\x11api/EntArea.proto\x1A\x14api/EntPackage.proto\x1A\x10api/Common.proto\x1A\x12api/EntOrder.proto\x1A\x10api/EntTag.proto\x1A\x13api/EntCommon.proto\x1A\x12api/EntAdmin.proto\x1A\x15api/EntCarModel.proto\"8\x0A\x11CityPackageTagEnt\x12#\x0A\x08tag_info\x18\x01 \x01(\x0B2\x11.proto.api.EntTag\"\x8C\x01\x0A\x13CityPackageOrderEnt\x12'\x0A\x0Aorder_info\x18\x01 \x01(\x0B2\x13.proto.api.EntOrder\x12\x16\x0A\x0Einsurance_info\x18\x02 \x01(\x09\x124\x0A\x11city_package_info\x18\x03 \x01(\x0B2\x19.proto.api.CityPackageEnt\"\x9F\x02\x0A\x0ECityPackageEnt\x12+\x0A\x0Cpackage_info\x18\x01 \x01(\x0B2\x15.proto.api.EntPackage\x124\x0A\x10package_category\x18\x02 \x01(\x0E2\x1A.proto.api.DEVICE_USE_TYPE\x12%\x0A\x09area_list\x18\x03 \x03(\x0B2\x12.proto.api.AreaEnt\x12+\x0A\x10battery_tag_info\x18\x04 \x01(\x0B2\x11.proto.api.EntTag\x12.\x0A\x0Ecar_model_info\x18\x05 \x01(\x0B2\x16.proto.api.CarModelEnt\x12&\x0A\x09shop_info\x18\x06 \x01(\x0B2\x13.proto.api.EntAdmin\"\xB8\x01\x0A\x0EPackageAreaEnt\x12%\x0A\x09area_info\x18\x01 \x01(\x0B2\x12.proto.api.AreaEnt\x12&\x0A\x0Bopen_status\x18\x02 \x01(\x0E2\x11.proto.api.YES_NO\x12\x15\x0A\x0Dis_can_select\x18\x03 \x01(\x08\x12\x13\x0A\x0Bis_selected\x18\x04 \x01(\x08\x12+\x0A\x08children\x18\x05 \x03(\x0B2\x19.proto.api.PackageAreaEntB.Z\x06api/v1\x92A#\x12!\x0A\x12\xE5\x9F\x8E\xE5\xB8\x82\xE5\xA5\x97\xE9\xA4\x90\xE5\xAE\x9E\xE4\xBD\x93\x12\x06\xE5\xAE\x9E\xE4\xBD\x932\x031.0b\x06proto3"
+            "\x0A\xC8\x08\x0A\x18api/EntCityPackage.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\x1A\x11api/EntArea.proto\x1A\x14api/EntPackage.proto\x1A\x10api/Common.proto\x1A\x12api/EntOrder.proto\x1A\x10api/EntTag.proto\x1A\x13api/EntCommon.proto\x1A\x12api/EntAdmin.proto\x1A\x15api/EntCarModel.proto\"8\x0A\x11CityPackageTagEnt\x12#\x0A\x08tag_info\x18\x01 \x01(\x0B2\x11.proto.api.EntTag\"\xBF\x02\x0A\x13CityPackageOrderEnt\x12@\x0A\x0Aorder_info\x18\x01 \x01(\x0B2,.proto.api.CityPackageOrderEnt.OrderInfoItem\x12\x16\x0A\x0Einsurance_info\x18\x02 \x01(\x09\x124\x0A\x11city_package_info\x18\x03 \x01(\x0B2\x19.proto.api.CityPackageEnt\x1A\x97\x01\x0A\x0DOrderInfoItem\x12&\x0A\x09base_info\x18\x01 \x01(\x0B2\x13.proto.api.EntOrder\x12\x1A\x0A\x12current_battery_sn\x18\x02 \x01(\x09\x12\x12\x0A\x0Abattery_sn\x18\x03 \x01(\x09\x12\x17\x0A\x0Fremain_capacity\x18\x04 \x01(\x09\x12\x15\x0A\x0Dpledge_status\x18\x05 \x01(\x05\"\xC8\x02\x0A\x0ECityPackageEnt\x12+\x0A\x0Cpackage_info\x18\x01 \x01(\x0B2\x15.proto.api.EntPackage\x124\x0A\x10package_category\x18\x02 \x01(\x0E2\x1A.proto.api.DEVICE_USE_TYPE\x12%\x0A\x09area_list\x18\x03 \x03(\x0B2\x12.proto.api.AreaEnt\x12+\x0A\x10battery_tag_info\x18\x04 \x01(\x0B2\x11.proto.api.EntTag\x12.\x0A\x0Ecar_model_info\x18\x05 \x01(\x0B2\x16.proto.api.CarModelEnt\x12&\x0A\x09shop_info\x18\x06 \x01(\x0B2\x13.proto.api.EntAdmin\x12'\x0A\x0Cis_recommend\x18\x07 \x01(\x0E2\x11.proto.api.YES_NO\"_\x0A\x0EPackageAreaEnt\x12%\x0A\x09area_info\x18\x01 \x01(\x0B2\x12.proto.api.AreaEnt\x12&\x0A\x0Bopen_status\x18\x02 \x01(\x0E2\x11.proto.api.YES_NOB.Z\x06api/v1\x92A#\x12!\x0A\x12\xE5\x9F\x8E\xE5\xB8\x82\xE5\xA5\x97\xE9\xA4\x90\xE5\xAE\x9E\xE4\xBD\x93\x12\x06\xE5\xAE\x9E\xE4\xBD\x932\x031.0b\x06proto3"
         , true);
 
         static::$is_initialized = true;

gen/php/GPBMetadata/Api/EntOrder.php

@@ -20,7 +20,7 @@ class EntOrder
         \GPBMetadata\Api\EntUser::initOnce();
         \GPBMetadata\Api\Common::initOnce();
         $pool->internalAddGeneratedFile(
-            "\x0A\x9D\x07\x0A\x12api/EntOrder.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\x1A\x12api/EntAdmin.proto\x1A\x11api/EntUser.proto\x1A\x10api/Common.proto\"\xD7\x01\x0A\x10EntExchangeOrder\x123\x0A\x0Fdevice_use_type\x18\x01 \x01(\x0E2\x1A.proto.api.DEVICE_USE_TYPE\x12\x12\x0A\x0Ahire_money\x18\x02 \x01(\x05\x12\x19\x0A\x11hire_duration_str\x18\x03 \x01(\x09\x12\x12\x0A\x0Ahire_price\x18\x04 \x01(\x05\x12\x10\x0A\x08order_sn\x18\x05 \x01(\x09\x129\x0A\x12device_hire_source\x18\x06 \x01(\x0E2\x1D.proto.api.DEVICE_HIRE_SOURCE\"4\x0A\x09OrderTime\x12\x15\x0A\x0Dordering_time\x18\x01 \x01(\x05\x12\x10\x0A\x08pay_time\x18\x02 \x01(\x05\"\x83\x02\x0A\x08EntOrder\x12\x10\x0A\x08order_sn\x18\x01 \x01(\x09\x12\x10\x0A\x08order_id\x18\x02 \x01(\x05\x12%\x0A\x09user_info\x18\x03 \x01(\x0B2\x12.proto.api.EntUser\x12&\x0A\x09shop_info\x18\x04 \x01(\x0B2\x13.proto.api.EntAdmin\x12(\x0A\x0Aorder_time\x18\x05 \x01(\x0B2\x14.proto.api.OrderTime\x12)\x0A\x0Apay_method\x18\x06 \x01(\x0E2\x15.proto.api.PAY_METHOD\x12/\x0A\x0Corder_source\x18\x07 \x01(\x0E2\x19.proto.api.REQUEST_SOURCE*\xC9\x01\x0A\x12DEVICE_HIRE_SOURCE\x12\x1F\x0A\x1BDEVICE_HIRE_SOURCE_RESERVED\x10\x00\x12\x1B\x0A\x17DEVICE_HIRE_SOURCE_SHOP\x10\x01\x12\x1E\x0A\x1ADEVICE_HIRE_SOURCE_CABINET\x10\x02\x12\x1B\x0A\x17DEVICE_HIRE_SOURCE_BIND\x10\x03\x12\x19\x0A\x15DEVICE_HIRE_SOURCE_IC\x10\x04\x12\x1D\x0A\x19DEVICE_HIRE_SOURCE_CHARGE\x10\x05B7Z\x06api/v1\x92A,\x12*\x0A\x0C\xE8\xAE\xA2\xE5\x8D\x95\xE5\xAE\x9E\xE4\xBD\x93\x12\x15\xE8\xAE\xA2\xE5\x8D\x95\xE6\xA8\xA1\xE5\x9D\x97\xE7\x9A\x84\xE5\xAE\x9E\xE4\xBD\x932\x031.0b\x06proto3"
+            "\x0A\xB1\x07\x0A\x12api/EntOrder.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\x1A\x12api/EntAdmin.proto\x1A\x11api/EntUser.proto\x1A\x10api/Common.proto\"\xD7\x01\x0A\x10EntExchangeOrder\x123\x0A\x0Fdevice_use_type\x18\x01 \x01(\x0E2\x1A.proto.api.DEVICE_USE_TYPE\x12\x12\x0A\x0Ahire_money\x18\x02 \x01(\x05\x12\x19\x0A\x11hire_duration_str\x18\x03 \x01(\x09\x12\x12\x0A\x0Ahire_price\x18\x04 \x01(\x05\x12\x10\x0A\x08order_sn\x18\x05 \x01(\x09\x129\x0A\x12device_hire_source\x18\x06 \x01(\x0E2\x1D.proto.api.DEVICE_HIRE_SOURCE\"4\x0A\x09OrderTime\x12\x15\x0A\x0Dordering_time\x18\x01 \x01(\x05\x12\x10\x0A\x08pay_time\x18\x02 \x01(\x05\"\x97\x02\x0A\x08EntOrder\x12\x10\x0A\x08order_sn\x18\x01 \x01(\x09\x12\x10\x0A\x08order_id\x18\x02 \x01(\x05\x12%\x0A\x09user_info\x18\x03 \x01(\x0B2\x12.proto.api.EntUser\x12&\x0A\x09shop_info\x18\x04 \x01(\x0B2\x13.proto.api.EntAdmin\x12(\x0A\x0Aorder_time\x18\x05 \x01(\x0B2\x14.proto.api.OrderTime\x12)\x0A\x0Apay_method\x18\x06 \x01(\x0E2\x15.proto.api.PAY_METHOD\x12/\x0A\x0Corder_source\x18\x07 \x01(\x0E2\x19.proto.api.REQUEST_SOURCE\x12\x12\x0A\x0Apay_status\x18\x08 \x01(\x05*\xC9\x01\x0A\x12DEVICE_HIRE_SOURCE\x12\x1F\x0A\x1BDEVICE_HIRE_SOURCE_RESERVED\x10\x00\x12\x1B\x0A\x17DEVICE_HIRE_SOURCE_SHOP\x10\x01\x12\x1E\x0A\x1ADEVICE_HIRE_SOURCE_CABINET\x10\x02\x12\x1B\x0A\x17DEVICE_HIRE_SOURCE_BIND\x10\x03\x12\x19\x0A\x15DEVICE_HIRE_SOURCE_IC\x10\x04\x12\x1D\x0A\x19DEVICE_HIRE_SOURCE_CHARGE\x10\x05B7Z\x06api/v1\x92A,\x12*\x0A\x0C\xE8\xAE\xA2\xE5\x8D\x95\xE5\xAE\x9E\xE4\xBD\x93\x12\x15\xE8\xAE\xA2\xE5\x8D\x95\xE6\xA8\xA1\xE5\x9D\x97\xE7\x9A\x84\xE5\xAE\x9E\xE4\xBD\x932\x031.0b\x06proto3"
         , true);
 
         static::$is_initialized = true;

gen/php/Proto/Api/AreaListReq.php

@@ -21,35 +21,23 @@ class AreaListReq extends \Google\Protobuf\Internal\Message
      */
     protected $page_arg = null;
     /**
-     * 筛选参数
+     * 开通状态
      *
-     * Generated from protobuf field <code>.proto.api.PackageAreaEnt package_area_arg = 2;</code>
+     * Generated from protobuf field <code>.proto.api.YES_NO open_status = 2;</code>
      */
-    protected $package_area_arg = null;
+    protected $open_status = 0;
     /**
-     * 子门店查询 默认false
+     * 省份CODE
      *
-     * Generated from protobuf field <code>bool is_child_query = 3;</code>
+     * Generated from protobuf field <code>string province_code = 3;</code>
      */
-    protected $is_child_query = false;
+    protected $province_code = '';
     /**
-     * 最小层级 1省级  2市级  3县级
+     * 城市CODE
      *
-     * Generated from protobuf field <code>int32 min_level = 4;</code>
+     * Generated from protobuf field <code>string city_code = 4;</code>
      */
-    protected $min_level = 0;
-    /**
-     * 查询的层级
-     *
-     * Generated from protobuf field <code>int32 level = 5;</code>
-     */
-    protected $level = 0;
-    /**
-     * 门店
-     *
-     * Generated from protobuf field <code>int32 admin_id = 6;</code>
-     */
-    protected $admin_id = 0;
+    protected $city_code = '';
 
     /**
      * Constructor.
@@ -59,16 +47,12 @@ class AreaListReq extends \Google\Protobuf\Internal\Message
      *
      *     @type \Proto\Api\PageArg $page_arg
      *           分页参数
-     *     @type \Proto\Api\PackageAreaEnt $package_area_arg
-     *           筛选参数
-     *     @type bool $is_child_query
-     *           子门店查询 默认false
-     *     @type int $min_level
-     *           最小层级 1省级  2市级  3县级
-     *     @type int $level
-     *           查询的层级
-     *     @type int $admin_id
-     *           门店
+     *     @type int $open_status
+     *           开通状态
+     *     @type string $province_code
+     *           省份CODE
+     *     @type string $city_code
+     *           城市CODE
      * }
      */
     public function __construct($data = NULL) {
@@ -113,141 +97,79 @@ class AreaListReq extends \Google\Protobuf\Internal\Message
     }
 
     /**
-     * 筛选参数
-     *
-     * Generated from protobuf field <code>.proto.api.PackageAreaEnt package_area_arg = 2;</code>
-     * @return \Proto\Api\PackageAreaEnt|null
-     */
-    public function getPackageAreaArg()
-    {
-        return $this->package_area_arg;
-    }
-
-    public function hasPackageAreaArg()
-    {
-        return isset($this->package_area_arg);
-    }
-
-    public function clearPackageAreaArg()
-    {
-        unset($this->package_area_arg);
-    }
-
-    /**
-     * 筛选参数
-     *
-     * Generated from protobuf field <code>.proto.api.PackageAreaEnt package_area_arg = 2;</code>
-     * @param \Proto\Api\PackageAreaEnt $var
-     * @return $this
-     */
-    public function setPackageAreaArg($var)
-    {
-        GPBUtil::checkMessage($var, \Proto\Api\PackageAreaEnt::class);
-        $this->package_area_arg = $var;
-
-        return $this;
-    }
-
-    /**
-     * 子门店查询 默认false
-     *
-     * Generated from protobuf field <code>bool is_child_query = 3;</code>
-     * @return bool
-     */
-    public function getIsChildQuery()
-    {
-        return $this->is_child_query;
-    }
-
-    /**
-     * 子门店查询 默认false
+     * 开通状态
      *
-     * Generated from protobuf field <code>bool is_child_query = 3;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setIsChildQuery($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->is_child_query = $var;
-
-        return $this;
-    }
-
-    /**
-     * 最小层级 1省级  2市级  3县级
-     *
-     * Generated from protobuf field <code>int32 min_level = 4;</code>
+     * Generated from protobuf field <code>.proto.api.YES_NO open_status = 2;</code>
      * @return int
      */
-    public function getMinLevel()
+    public function getOpenStatus()
     {
-        return $this->min_level;
+        return $this->open_status;
     }
 
     /**
-     * 最小层级 1省级  2市级  3县级
+     * 开通状态
      *
-     * Generated from protobuf field <code>int32 min_level = 4;</code>
+     * Generated from protobuf field <code>.proto.api.YES_NO open_status = 2;</code>
      * @param int $var
      * @return $this
      */
-    public function setMinLevel($var)
+    public function setOpenStatus($var)
     {
-        GPBUtil::checkInt32($var);
-        $this->min_level = $var;
+        GPBUtil::checkEnum($var, \Proto\Api\YES_NO::class);
+        $this->open_status = $var;
 
         return $this;
     }
 
     /**
-     * 查询的层级
+     * 省份CODE
      *
-     * Generated from protobuf field <code>int32 level = 5;</code>
-     * @return int
+     * Generated from protobuf field <code>string province_code = 3;</code>
+     * @return string
      */
-    public function getLevel()
+    public function getProvinceCode()
     {
-        return $this->level;
+        return $this->province_code;
     }
 
     /**
-     * 查询的层级
+     * 省份CODE
      *
-     * Generated from protobuf field <code>int32 level = 5;</code>
-     * @param int $var
+     * Generated from protobuf field <code>string province_code = 3;</code>
+     * @param string $var
      * @return $this
      */
-    public function setLevel($var)
+    public function setProvinceCode($var)
     {
-        GPBUtil::checkInt32($var);
-        $this->level = $var;
+        GPBUtil::checkString($var, True);
+        $this->province_code = $var;
 
         return $this;
     }
 
     /**
-     * 门店
+     * 城市CODE
      *
-     * Generated from protobuf field <code>int32 admin_id = 6;</code>
-     * @return int
+     * Generated from protobuf field <code>string city_code = 4;</code>
+     * @return string
      */
-    public function getAdminId()
+    public function getCityCode()
     {
-        return $this->admin_id;
+        return $this->city_code;
     }
 
     /**
-     * 门店
+     * 城市CODE
      *
-     * Generated from protobuf field <code>int32 admin_id = 6;</code>
-     * @param int $var
+     * Generated from protobuf field <code>string city_code = 4;</code>
+     * @param string $var
      * @return $this
      */
-    public function setAdminId($var)
+    public function setCityCode($var)
     {
-        GPBUtil::checkInt32($var);
-        $this->admin_id = $var;
+        GPBUtil::checkString($var, True);
+        $this->city_code = $var;
 
         return $this;
     }

gen/php/Proto/Api/ChangeRecommendReq.php

@@ -0,0 +1,100 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackage.proto
+
+namespace Proto\Api;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>proto.api.ChangeRecommendReq</code>
+ */
+class ChangeRecommendReq extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * 套餐code
+     *
+     * Generated from protobuf field <code>repeated string package_code = 1;</code>
+     */
+    private $package_code;
+    /**
+     * 是否推荐
+     *
+     * Generated from protobuf field <code>.proto.api.YES_NO is_recommend = 2;</code>
+     */
+    protected $is_recommend = 0;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type array<string>|\Google\Protobuf\Internal\RepeatedField $package_code
+     *           套餐code
+     *     @type int $is_recommend
+     *           是否推荐
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * 套餐code
+     *
+     * Generated from protobuf field <code>repeated string package_code = 1;</code>
+     * @return \Google\Protobuf\Internal\RepeatedField
+     */
+    public function getPackageCode()
+    {
+        return $this->package_code;
+    }
+
+    /**
+     * 套餐code
+     *
+     * Generated from protobuf field <code>repeated string package_code = 1;</code>
+     * @param array<string>|\Google\Protobuf\Internal\RepeatedField $var
+     * @return $this
+     */
+    public function setPackageCode($var)
+    {
+        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING);
+        $this->package_code = $arr;
+
+        return $this;
+    }
+
+    /**
+     * 是否推荐
+     *
+     * Generated from protobuf field <code>.proto.api.YES_NO is_recommend = 2;</code>
+     * @return int
+     */
+    public function getIsRecommend()
+    {
+        return $this->is_recommend;
+    }
+
+    /**
+     * 是否推荐
+     *
+     * Generated from protobuf field <code>.proto.api.YES_NO is_recommend = 2;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setIsRecommend($var)
+    {
+        GPBUtil::checkEnum($var, \Proto\Api\YES_NO::class);
+        $this->is_recommend = $var;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/ChangeRecommendRes.php

@@ -0,0 +1,32 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackage.proto
+
+namespace Proto\Api;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>proto.api.ChangeRecommendRes</code>
+ */
+class ChangeRecommendRes extends \Google\Protobuf\Internal\Message
+{
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+}
+

gen/php/Proto/Api/CityPackageAddReq.php

@@ -23,7 +23,7 @@ class CityPackageAddReq extends \Google\Protobuf\Internal\Message
     /**
      * 套餐数组列表
      *
-     * Generated from protobuf field <code>repeated .proto.api.CityPackageEnt package_list = 2;</code>
+     * Generated from protobuf field <code>repeated .proto.api.CityPackageAddReq.AddItem package_list = 2;</code>
      */
     private $package_list;
     /**
@@ -41,7 +41,7 @@ class CityPackageAddReq extends \Google\Protobuf\Internal\Message
      *
      *     @type int $shop_id
      *           门店ID 默认为当前登陆的门店ID
-     *     @type array<\Proto\Api\CityPackageEnt>|\Google\Protobuf\Internal\RepeatedField $package_list
+     *     @type array<\Proto\Api\CityPackageAddReq\AddItem>|\Google\Protobuf\Internal\RepeatedField $package_list
      *           套餐数组列表
      *     @type int $package_category
      *           套餐分类 1租电套餐 2车电一体 3租车套餐
@@ -81,7 +81,7 @@ class CityPackageAddReq extends \Google\Protobuf\Internal\Message
     /**
      * 套餐数组列表
      *
-     * Generated from protobuf field <code>repeated .proto.api.CityPackageEnt package_list = 2;</code>
+     * Generated from protobuf field <code>repeated .proto.api.CityPackageAddReq.AddItem package_list = 2;</code>
      * @return \Google\Protobuf\Internal\RepeatedField
      */
     public function getPackageList()
@@ -92,13 +92,13 @@ class CityPackageAddReq extends \Google\Protobuf\Internal\Message
     /**
      * 套餐数组列表
      *
-     * Generated from protobuf field <code>repeated .proto.api.CityPackageEnt package_list = 2;</code>
-     * @param array<\Proto\Api\CityPackageEnt>|\Google\Protobuf\Internal\RepeatedField $var
+     * Generated from protobuf field <code>repeated .proto.api.CityPackageAddReq.AddItem package_list = 2;</code>
+     * @param array<\Proto\Api\CityPackageAddReq\AddItem>|\Google\Protobuf\Internal\RepeatedField $var
      * @return $this
      */
     public function setPackageList($var)
     {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Proto\Api\CityPackageEnt::class);
+        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Proto\Api\CityPackageAddReq\AddItem::class);
         $this->package_list = $arr;
 
         return $this;

gen/php/Proto/Api/CityPackageAddReq/AddItem.php

@@ -0,0 +1,562 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackage.proto
+
+namespace Proto\Api\CityPackageAddReq;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>proto.api.CityPackageAddReq.AddItem</code>
+ */
+class AddItem extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * 套餐名称
+     *
+     * Generated from protobuf field <code>string name = 1;</code>
+     */
+    protected $name = '';
+    /**
+     * 套餐类型
+     *
+     * Generated from protobuf field <code>.proto.api.PackageType type = 2;</code>
+     */
+    protected $type = 0;
+    /**
+     * 押金
+     *
+     * Generated from protobuf field <code>int32 pledge = 3;</code>
+     */
+    protected $pledge = 0;
+    /**
+     * 天数
+     *
+     * Generated from protobuf field <code>int32 total_day = 4;</code>
+     */
+    protected $total_day = 0;
+    /**
+     * 次数
+     *
+     * Generated from protobuf field <code>int32 total_num = 5;</code>
+     */
+    protected $total_num = 0;
+    /**
+     * 套餐显示价格
+     *
+     * Generated from protobuf field <code>int32 show_money = 6;</code>
+     */
+    protected $show_money = 0;
+    /**
+     * 套餐实际价格，元
+     *
+     * Generated from protobuf field <code>int32 money = 7;</code>
+     */
+    protected $money = 0;
+    /**
+     * 单次换电价格，元
+     *
+     * Generated from protobuf field <code>int32 exchange_money = 8;</code>
+     */
+    protected $exchange_money = 0;
+    /**
+     * 购买限制数量
+     *
+     * Generated from protobuf field <code>int32 buy_limit = 9;</code>
+     */
+    protected $buy_limit = 0;
+    /**
+     * 上下架状态
+     *
+     * Generated from protobuf field <code>.proto.api.LISTED_STATUS listed_status = 10;</code>
+     */
+    protected $listed_status = 0;
+    /**
+     * 库存
+     *
+     * Generated from protobuf field <code>int32 stock = 12;</code>
+     */
+    protected $stock = 0;
+    /**
+     * 套餐分类 1租电套餐 2车电一体 3租车套餐
+     *
+     * Generated from protobuf field <code>.proto.api.DEVICE_USE_TYPE package_category = 13;</code>
+     */
+    protected $package_category = 0;
+    /**
+     * 支持的区县ID列表
+     *
+     * Generated from protobuf field <code>repeated .proto.api.AreaEnt area_list = 14;</code>
+     */
+    private $area_list;
+    /**
+     * 电池标签信息
+     *
+     * Generated from protobuf field <code>.proto.api.EntTag battery_tag_info = 15;</code>
+     */
+    protected $battery_tag_info = null;
+    /**
+     * 车型信息
+     *
+     * Generated from protobuf field <code>.proto.api.CarModelEnt car_model_info = 16;</code>
+     */
+    protected $car_model_info = null;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $name
+     *           套餐名称
+     *     @type int $type
+     *           套餐类型
+     *     @type int $pledge
+     *           押金
+     *     @type int $total_day
+     *           天数
+     *     @type int $total_num
+     *           次数
+     *     @type int $show_money
+     *           套餐显示价格
+     *     @type int $money
+     *           套餐实际价格，元
+     *     @type int $exchange_money
+     *           单次换电价格，元
+     *     @type int $buy_limit
+     *           购买限制数量
+     *     @type int $listed_status
+     *           上下架状态
+     *     @type int $stock
+     *           库存
+     *     @type int $package_category
+     *           套餐分类 1租电套餐 2车电一体 3租车套餐
+     *     @type array<\Proto\Api\AreaEnt>|\Google\Protobuf\Internal\RepeatedField $area_list
+     *           支持的区县ID列表
+     *     @type \Proto\Api\EntTag $battery_tag_info
+     *           电池标签信息
+     *     @type \Proto\Api\CarModelEnt $car_model_info
+     *           车型信息
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * 套餐名称
+     *
+     * Generated from protobuf field <code>string name = 1;</code>
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * 套餐名称
+     *
+     * Generated from protobuf field <code>string name = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setName($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->name = $var;
+
+        return $this;
+    }
+
+    /**
+     * 套餐类型
+     *
+     * Generated from protobuf field <code>.proto.api.PackageType type = 2;</code>
+     * @return int
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * 套餐类型
+     *
+     * Generated from protobuf field <code>.proto.api.PackageType type = 2;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setType($var)
+    {
+        GPBUtil::checkEnum($var, \Proto\Api\PackageType::class);
+        $this->type = $var;
+
+        return $this;
+    }
+
+    /**
+     * 押金
+     *
+     * Generated from protobuf field <code>int32 pledge = 3;</code>
+     * @return int
+     */
+    public function getPledge()
+    {
+        return $this->pledge;
+    }
+
+    /**
+     * 押金
+     *
+     * Generated from protobuf field <code>int32 pledge = 3;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setPledge($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->pledge = $var;
+
+        return $this;
+    }
+
+    /**
+     * 天数
+     *
+     * Generated from protobuf field <code>int32 total_day = 4;</code>
+     * @return int
+     */
+    public function getTotalDay()
+    {
+        return $this->total_day;
+    }
+
+    /**
+     * 天数
+     *
+     * Generated from protobuf field <code>int32 total_day = 4;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setTotalDay($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->total_day = $var;
+
+        return $this;
+    }
+
+    /**
+     * 次数
+     *
+     * Generated from protobuf field <code>int32 total_num = 5;</code>
+     * @return int
+     */
+    public function getTotalNum()
+    {
+        return $this->total_num;
+    }
+
+    /**
+     * 次数
+     *
+     * Generated from protobuf field <code>int32 total_num = 5;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setTotalNum($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->total_num = $var;
+
+        return $this;
+    }
+
+    /**
+     * 套餐显示价格
+     *
+     * Generated from protobuf field <code>int32 show_money = 6;</code>
+     * @return int
+     */
+    public function getShowMoney()
+    {
+        return $this->show_money;
+    }
+
+    /**
+     * 套餐显示价格
+     *
+     * Generated from protobuf field <code>int32 show_money = 6;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setShowMoney($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->show_money = $var;
+
+        return $this;
+    }
+
+    /**
+     * 套餐实际价格，元
+     *
+     * Generated from protobuf field <code>int32 money = 7;</code>
+     * @return int
+     */
+    public function getMoney()
+    {
+        return $this->money;
+    }
+
+    /**
+     * 套餐实际价格，元
+     *
+     * Generated from protobuf field <code>int32 money = 7;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setMoney($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->money = $var;
+
+        return $this;
+    }
+
+    /**
+     * 单次换电价格，元
+     *
+     * Generated from protobuf field <code>int32 exchange_money = 8;</code>
+     * @return int
+     */
+    public function getExchangeMoney()
+    {
+        return $this->exchange_money;
+    }
+
+    /**
+     * 单次换电价格，元
+     *
+     * Generated from protobuf field <code>int32 exchange_money = 8;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setExchangeMoney($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->exchange_money = $var;
+
+        return $this;
+    }
+
+    /**
+     * 购买限制数量
+     *
+     * Generated from protobuf field <code>int32 buy_limit = 9;</code>
+     * @return int
+     */
+    public function getBuyLimit()
+    {
+        return $this->buy_limit;
+    }
+
+    /**
+     * 购买限制数量
+     *
+     * Generated from protobuf field <code>int32 buy_limit = 9;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setBuyLimit($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->buy_limit = $var;
+
+        return $this;
+    }
+
+    /**
+     * 上下架状态
+     *
+     * Generated from protobuf field <code>.proto.api.LISTED_STATUS listed_status = 10;</code>
+     * @return int
+     */
+    public function getListedStatus()
+    {
+        return $this->listed_status;
+    }
+
+    /**
+     * 上下架状态
+     *
+     * Generated from protobuf field <code>.proto.api.LISTED_STATUS listed_status = 10;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setListedStatus($var)
+    {
+        GPBUtil::checkEnum($var, \Proto\Api\LISTED_STATUS::class);
+        $this->listed_status = $var;
+
+        return $this;
+    }
+
+    /**
+     * 库存
+     *
+     * Generated from protobuf field <code>int32 stock = 12;</code>
+     * @return int
+     */
+    public function getStock()
+    {
+        return $this->stock;
+    }
+
+    /**
+     * 库存
+     *
+     * Generated from protobuf field <code>int32 stock = 12;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setStock($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->stock = $var;
+
+        return $this;
+    }
+
+    /**
+     * 套餐分类 1租电套餐 2车电一体 3租车套餐
+     *
+     * Generated from protobuf field <code>.proto.api.DEVICE_USE_TYPE package_category = 13;</code>
+     * @return int
+     */
+    public function getPackageCategory()
+    {
+        return $this->package_category;
+    }
+
+    /**
+     * 套餐分类 1租电套餐 2车电一体 3租车套餐
+     *
+     * Generated from protobuf field <code>.proto.api.DEVICE_USE_TYPE package_category = 13;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setPackageCategory($var)
+    {
+        GPBUtil::checkEnum($var, \Proto\Api\DEVICE_USE_TYPE::class);
+        $this->package_category = $var;
+
+        return $this;
+    }
+
+    /**
+     * 支持的区县ID列表
+     *
+     * Generated from protobuf field <code>repeated .proto.api.AreaEnt area_list = 14;</code>
+     * @return \Google\Protobuf\Internal\RepeatedField
+     */
+    public function getAreaList()
+    {
+        return $this->area_list;
+    }
+
+    /**
+     * 支持的区县ID列表
+     *
+     * Generated from protobuf field <code>repeated .proto.api.AreaEnt area_list = 14;</code>
+     * @param array<\Proto\Api\AreaEnt>|\Google\Protobuf\Internal\RepeatedField $var
+     * @return $this
+     */
+    public function setAreaList($var)
+    {
+        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Proto\Api\AreaEnt::class);
+        $this->area_list = $arr;
+
+        return $this;
+    }
+
+    /**
+     * 电池标签信息
+     *
+     * Generated from protobuf field <code>.proto.api.EntTag battery_tag_info = 15;</code>
+     * @return \Proto\Api\EntTag|null
+     */
+    public function getBatteryTagInfo()
+    {
+        return $this->battery_tag_info;
+    }
+
+    public function hasBatteryTagInfo()
+    {
+        return isset($this->battery_tag_info);
+    }
+
+    public function clearBatteryTagInfo()
+    {
+        unset($this->battery_tag_info);
+    }
+
+    /**
+     * 电池标签信息
+     *
+     * Generated from protobuf field <code>.proto.api.EntTag battery_tag_info = 15;</code>
+     * @param \Proto\Api\EntTag $var
+     * @return $this
+     */
+    public function setBatteryTagInfo($var)
+    {
+        GPBUtil::checkMessage($var, \Proto\Api\EntTag::class);
+        $this->battery_tag_info = $var;
+
+        return $this;
+    }
+
+    /**
+     * 车型信息
+     *
+     * Generated from protobuf field <code>.proto.api.CarModelEnt car_model_info = 16;</code>
+     * @return \Proto\Api\CarModelEnt|null
+     */
+    public function getCarModelInfo()
+    {
+        return $this->car_model_info;
+    }
+
+    public function hasCarModelInfo()
+    {
+        return isset($this->car_model_info);
+    }
+
+    public function clearCarModelInfo()
+    {
+        unset($this->car_model_info);
+    }
+
+    /**
+     * 车型信息
+     *
+     * Generated from protobuf field <code>.proto.api.CarModelEnt car_model_info = 16;</code>
+     * @param \Proto\Api\CarModelEnt $var
+     * @return $this
+     */
+    public function setCarModelInfo($var)
+    {
+        GPBUtil::checkMessage($var, \Proto\Api\CarModelEnt::class);
+        $this->car_model_info = $var;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/CityPackageEnt.php

@@ -52,6 +52,12 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
      * Generated from protobuf field <code>.proto.api.EntAdmin shop_info = 6;</code>
      */
     protected $shop_info = null;
+    /**
+     * 是否是推荐
+     *
+     * Generated from protobuf field <code>.proto.api.YES_NO is_recommend = 7;</code>
+     */
+    protected $is_recommend = 0;
 
     /**
      * Constructor.
@@ -71,6 +77,8 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
      *           车型信息
      *     @type \Proto\Api\EntAdmin $shop_info
      *           门店信息
+     *     @type int $is_recommend
+     *           是否是推荐
      * }
      */
     public function __construct($data = NULL) {
@@ -274,5 +282,31 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
         return $this;
     }
 
+    /**
+     * 是否是推荐
+     *
+     * Generated from protobuf field <code>.proto.api.YES_NO is_recommend = 7;</code>
+     * @return int
+     */
+    public function getIsRecommend()
+    {
+        return $this->is_recommend;
+    }
+
+    /**
+     * 是否是推荐
+     *
+     * Generated from protobuf field <code>.proto.api.YES_NO is_recommend = 7;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setIsRecommend($var)
+    {
+        GPBUtil::checkEnum($var, \Proto\Api\YES_NO::class);
+        $this->is_recommend = $var;
+
+        return $this;
+    }
+
 }
 

gen/php/Proto/Api/CityPackageOrderEnt.php

@@ -17,9 +17,9 @@ use Google\Protobuf\Internal\GPBUtil;
 class CityPackageOrderEnt extends \Google\Protobuf\Internal\Message
 {
     /**
-     * 基本订单信息
+     * 订单信息
      *
-     * Generated from protobuf field <code>.proto.api.EntOrder order_info = 1;</code>
+     * Generated from protobuf field <code>.proto.api.CityPackageOrderEnt.OrderInfoItem order_info = 1;</code>
      */
     protected $order_info = null;
     /**
@@ -41,8 +41,8 @@ class CityPackageOrderEnt extends \Google\Protobuf\Internal\Message
      * @param array $data {
      *     Optional. Data for populating the Message object.
      *
-     *     @type \Proto\Api\EntOrder $order_info
-     *           基本订单信息
+     *     @type \Proto\Api\CityPackageOrderEnt\OrderInfoItem $order_info
+     *           订单信息
      *     @type string $insurance_info
      *           保险信息
      *     @type \Proto\Api\CityPackageEnt $city_package_info
@@ -55,10 +55,10 @@ class CityPackageOrderEnt extends \Google\Protobuf\Internal\Message
     }
 
     /**
-     * 基本订单信息
+     * 订单信息
      *
-     * Generated from protobuf field <code>.proto.api.EntOrder order_info = 1;</code>
-     * @return \Proto\Api\EntOrder|null
+     * Generated from protobuf field <code>.proto.api.CityPackageOrderEnt.OrderInfoItem order_info = 1;</code>
+     * @return \Proto\Api\CityPackageOrderEnt\OrderInfoItem|null
      */
     public function getOrderInfo()
     {
@@ -76,15 +76,15 @@ class CityPackageOrderEnt extends \Google\Protobuf\Internal\Message
     }
 
     /**
-     * 基本订单信息
+     * 订单信息
      *
-     * Generated from protobuf field <code>.proto.api.EntOrder order_info = 1;</code>
-     * @param \Proto\Api\EntOrder $var
+     * Generated from protobuf field <code>.proto.api.CityPackageOrderEnt.OrderInfoItem order_info = 1;</code>
+     * @param \Proto\Api\CityPackageOrderEnt\OrderInfoItem $var
      * @return $this
      */
     public function setOrderInfo($var)
     {
-        GPBUtil::checkMessage($var, \Proto\Api\EntOrder::class);
+        GPBUtil::checkMessage($var, \Proto\Api\CityPackageOrderEnt\OrderInfoItem::class);
         $this->order_info = $var;
 
         return $this;

gen/php/Proto/Api/CityPackageOrderEnt/OrderInfoItem.php

@@ -0,0 +1,212 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/EntCityPackage.proto
+
+namespace Proto\Api\CityPackageOrderEnt;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>proto.api.CityPackageOrderEnt.OrderInfoItem</code>
+ */
+class OrderInfoItem extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * 基础信息
+     *
+     * Generated from protobuf field <code>.proto.api.EntOrder base_info = 1;</code>
+     */
+    protected $base_info = null;
+    /**
+     * 当前电池
+     *
+     * Generated from protobuf field <code>string current_battery_sn = 2;</code>
+     */
+    protected $current_battery_sn = '';
+    /**
+     * 购买绑定的电池
+     *
+     * Generated from protobuf field <code>string battery_sn = 3;</code>
+     */
+    protected $battery_sn = '';
+    /**
+     * 剩余用量
+     *
+     * Generated from protobuf field <code>string remain_capacity = 4;</code>
+     */
+    protected $remain_capacity = '';
+    /**
+     * 押金状态 0待支付，1已支付，2免押，3无需支付 4 押金已退
+     *
+     * Generated from protobuf field <code>int32 pledge_status = 5;</code>
+     */
+    protected $pledge_status = 0;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type \Proto\Api\EntOrder $base_info
+     *           基础信息
+     *     @type string $current_battery_sn
+     *           当前电池
+     *     @type string $battery_sn
+     *           购买绑定的电池
+     *     @type string $remain_capacity
+     *           剩余用量
+     *     @type int $pledge_status
+     *           押金状态 0待支付，1已支付，2免押，3无需支付 4 押金已退
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\EntCityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * 基础信息
+     *
+     * Generated from protobuf field <code>.proto.api.EntOrder base_info = 1;</code>
+     * @return \Proto\Api\EntOrder|null
+     */
+    public function getBaseInfo()
+    {
+        return $this->base_info;
+    }
+
+    public function hasBaseInfo()
+    {
+        return isset($this->base_info);
+    }
+
+    public function clearBaseInfo()
+    {
+        unset($this->base_info);
+    }
+
+    /**
+     * 基础信息
+     *
+     * Generated from protobuf field <code>.proto.api.EntOrder base_info = 1;</code>
+     * @param \Proto\Api\EntOrder $var
+     * @return $this
+     */
+    public function setBaseInfo($var)
+    {
+        GPBUtil::checkMessage($var, \Proto\Api\EntOrder::class);
+        $this->base_info = $var;
+
+        return $this;
+    }
+
+    /**
+     * 当前电池
+     *
+     * Generated from protobuf field <code>string current_battery_sn = 2;</code>
+     * @return string
+     */
+    public function getCurrentBatterySn()
+    {
+        return $this->current_battery_sn;
+    }
+
+    /**
+     * 当前电池
+     *
+     * Generated from protobuf field <code>string current_battery_sn = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setCurrentBatterySn($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->current_battery_sn = $var;
+
+        return $this;
+    }
+
+    /**
+     * 购买绑定的电池
+     *
+     * Generated from protobuf field <code>string battery_sn = 3;</code>
+     * @return string
+     */
+    public function getBatterySn()
+    {
+        return $this->battery_sn;
+    }
+
+    /**
+     * 购买绑定的电池
+     *
+     * Generated from protobuf field <code>string battery_sn = 3;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setBatterySn($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->battery_sn = $var;
+
+        return $this;
+    }
+
+    /**
+     * 剩余用量
+     *
+     * Generated from protobuf field <code>string remain_capacity = 4;</code>
+     * @return string
+     */
+    public function getRemainCapacity()
+    {
+        return $this->remain_capacity;
+    }
+
+    /**
+     * 剩余用量
+     *
+     * Generated from protobuf field <code>string remain_capacity = 4;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setRemainCapacity($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->remain_capacity = $var;
+
+        return $this;
+    }
+
+    /**
+     * 押金状态 0待支付，1已支付，2免押，3无需支付 4 押金已退
+     *
+     * Generated from protobuf field <code>int32 pledge_status = 5;</code>
+     * @return int
+     */
+    public function getPledgeStatus()
+    {
+        return $this->pledge_status;
+    }
+
+    /**
+     * 押金状态 0待支付，1已支付，2免押，3无需支付 4 押金已退
+     *
+     * Generated from protobuf field <code>int32 pledge_status = 5;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setPledgeStatus($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->pledge_status = $var;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/CloseAreaReq.php

@@ -20,12 +20,6 @@ class CloseAreaReq extends \Google\Protobuf\Internal\Message
      * Generated from protobuf field <code>repeated string area_ids = 1;</code>
      */
     private $area_ids;
-    /**
-     * 是否子门店操作关闭 默认false
-     *
-     * Generated from protobuf field <code>bool is_child_opt = 3;</code>
-     */
-    protected $is_child_opt = false;
 
     /**
      * Constructor.
@@ -35,8 +29,6 @@ class CloseAreaReq extends \Google\Protobuf\Internal\Message
      *
      *     @type array<string>|\Google\Protobuf\Internal\RepeatedField $area_ids
      *           地区CODE列表
-     *     @type bool $is_child_opt
-     *           是否子门店操作关闭 默认false
      * }
      */
     public function __construct($data = NULL) {
@@ -70,31 +62,5 @@ class CloseAreaReq extends \Google\Protobuf\Internal\Message
         return $this;
     }
 
-    /**
-     * 是否子门店操作关闭 默认false
-     *
-     * Generated from protobuf field <code>bool is_child_opt = 3;</code>
-     * @return bool
-     */
-    public function getIsChildOpt()
-    {
-        return $this->is_child_opt;
-    }
-
-    /**
-     * 是否子门店操作关闭 默认false
-     *
-     * Generated from protobuf field <code>bool is_child_opt = 3;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setIsChildOpt($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->is_child_opt = $var;
-
-        return $this;
-    }
-
 }
 

gen/php/Proto/Api/EntOrder.php

@@ -58,6 +58,12 @@ class EntOrder extends \Google\Protobuf\Internal\Message
      * Generated from protobuf field <code>.proto.api.REQUEST_SOURCE order_source = 7;</code>
      */
     protected $order_source = 0;
+    /**
+     * 支付状态
+     *
+     * Generated from protobuf field <code>int32 pay_status = 8;</code>
+     */
+    protected $pay_status = 0;
 
     /**
      * Constructor.
@@ -79,6 +85,8 @@ class EntOrder extends \Google\Protobuf\Internal\Message
      *           支付方式
      *     @type int $order_source
      *           订单来源
+     *     @type int $pay_status
+     *           支付状态
      * }
      */
     public function __construct($data = NULL) {
@@ -298,5 +306,31 @@ class EntOrder extends \Google\Protobuf\Internal\Message
         return $this;
     }
 
+    /**
+     * 支付状态
+     *
+     * Generated from protobuf field <code>int32 pay_status = 8;</code>
+     * @return int
+     */
+    public function getPayStatus()
+    {
+        return $this->pay_status;
+    }
+
+    /**
+     * 支付状态
+     *
+     * Generated from protobuf field <code>int32 pay_status = 8;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setPayStatus($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->pay_status = $var;
+
+        return $this;
+    }
+
 }
 

gen/php/Proto/Api/OpenAreaReq.php

@@ -15,17 +15,11 @@ use Google\Protobuf\Internal\GPBUtil;
 class OpenAreaReq extends \Google\Protobuf\Internal\Message
 {
     /**
-     * 地区CODE列表
+     * 开通的地区
      *
-     * Generated from protobuf field <code>repeated string area_ids = 1;</code>
+     * Generated from protobuf field <code>repeated .proto.api.OpenAreaReq.OpenItem list = 1;</code>
      */
-    private $area_ids;
-    /**
-     * 是否子门店操作开通 默认false
-     *
-     * Generated from protobuf field <code>bool is_child_opt = 3;</code>
-     */
-    protected $is_child_opt = false;
+    private $list;
 
     /**
      * Constructor.
@@ -33,10 +27,8 @@ class OpenAreaReq extends \Google\Protobuf\Internal\Message
      * @param array $data {
      *     Optional. Data for populating the Message object.
      *
-     *     @type array<string>|\Google\Protobuf\Internal\RepeatedField $area_ids
-     *           地区CODE列表
-     *     @type bool $is_child_opt
-     *           是否子门店操作开通 默认false
+     *     @type array<\Proto\Api\OpenAreaReq\OpenItem>|\Google\Protobuf\Internal\RepeatedField $list
+     *           开通的地区
      * }
      */
     public function __construct($data = NULL) {
@@ -45,53 +37,27 @@ class OpenAreaReq extends \Google\Protobuf\Internal\Message
     }
 
     /**
-     * 地区CODE列表
+     * 开通的地区
      *
-     * Generated from protobuf field <code>repeated string area_ids = 1;</code>
+     * Generated from protobuf field <code>repeated .proto.api.OpenAreaReq.OpenItem list = 1;</code>
      * @return \Google\Protobuf\Internal\RepeatedField
      */
-    public function getAreaIds()
-    {
-        return $this->area_ids;
-    }
-
-    /**
-     * 地区CODE列表
-     *
-     * Generated from protobuf field <code>repeated string area_ids = 1;</code>
-     * @param array<string>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setAreaIds($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING);
-        $this->area_ids = $arr;
-
-        return $this;
-    }
-
-    /**
-     * 是否子门店操作开通 默认false
-     *
-     * Generated from protobuf field <code>bool is_child_opt = 3;</code>
-     * @return bool
-     */
-    public function getIsChildOpt()
+    public function getList()
     {
-        return $this->is_child_opt;
+        return $this->list;
     }
 
     /**
-     * 是否子门店操作开通 默认false
+     * 开通的地区
      *
-     * Generated from protobuf field <code>bool is_child_opt = 3;</code>
-     * @param bool $var
+     * Generated from protobuf field <code>repeated .proto.api.OpenAreaReq.OpenItem list = 1;</code>
+     * @param array<\Proto\Api\OpenAreaReq\OpenItem>|\Google\Protobuf\Internal\RepeatedField $var
      * @return $this
      */
-    public function setIsChildOpt($var)
+    public function setList($var)
     {
-        GPBUtil::checkBool($var);
-        $this->is_child_opt = $var;
+        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Proto\Api\OpenAreaReq\OpenItem::class);
+        $this->list = $arr;
 
         return $this;
     }

gen/php/Proto/Api/OpenAreaReq/OpenItem.php

@@ -0,0 +1,202 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackage.proto
+
+namespace Proto\Api\OpenAreaReq;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>proto.api.OpenAreaReq.OpenItem</code>
+ */
+class OpenItem extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * 选择区域的id
+     *
+     * Generated from protobuf field <code>string area_id = 1;</code>
+     */
+    protected $area_id = '';
+    /**
+     * 电池押金
+     *
+     * Generated from protobuf field <code>int32 battery_deposit = 2;</code>
+     */
+    protected $battery_deposit = 0;
+    /**
+     * 车辆押金
+     *
+     * Generated from protobuf field <code>int32 car_deposit = 3;</code>
+     */
+    protected $car_deposit = 0;
+    /**
+     * 车电一体押金
+     *
+     * Generated from protobuf field <code>int32 battery_car_deposit = 4;</code>
+     */
+    protected $battery_car_deposit = 0;
+    /**
+     * 开通状态
+     *
+     * Generated from protobuf field <code>.proto.api.YES_NO open_status = 5;</code>
+     */
+    protected $open_status = 0;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $area_id
+     *           选择区域的id
+     *     @type int $battery_deposit
+     *           电池押金
+     *     @type int $car_deposit
+     *           车辆押金
+     *     @type int $battery_car_deposit
+     *           车电一体押金
+     *     @type int $open_status
+     *           开通状态
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * 选择区域的id
+     *
+     * Generated from protobuf field <code>string area_id = 1;</code>
+     * @return string
+     */
+    public function getAreaId()
+    {
+        return $this->area_id;
+    }
+
+    /**
+     * 选择区域的id
+     *
+     * Generated from protobuf field <code>string area_id = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setAreaId($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->area_id = $var;
+
+        return $this;
+    }
+
+    /**
+     * 电池押金
+     *
+     * Generated from protobuf field <code>int32 battery_deposit = 2;</code>
+     * @return int
+     */
+    public function getBatteryDeposit()
+    {
+        return $this->battery_deposit;
+    }
+
+    /**
+     * 电池押金
+     *
+     * Generated from protobuf field <code>int32 battery_deposit = 2;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setBatteryDeposit($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->battery_deposit = $var;
+
+        return $this;
+    }
+
+    /**
+     * 车辆押金
+     *
+     * Generated from protobuf field <code>int32 car_deposit = 3;</code>
+     * @return int
+     */
+    public function getCarDeposit()
+    {
+        return $this->car_deposit;
+    }
+
+    /**
+     * 车辆押金
+     *
+     * Generated from protobuf field <code>int32 car_deposit = 3;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setCarDeposit($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->car_deposit = $var;
+
+        return $this;
+    }
+
+    /**
+     * 车电一体押金
+     *
+     * Generated from protobuf field <code>int32 battery_car_deposit = 4;</code>
+     * @return int
+     */
+    public function getBatteryCarDeposit()
+    {
+        return $this->battery_car_deposit;
+    }
+
+    /**
+     * 车电一体押金
+     *
+     * Generated from protobuf field <code>int32 battery_car_deposit = 4;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setBatteryCarDeposit($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->battery_car_deposit = $var;
+
+        return $this;
+    }
+
+    /**
+     * 开通状态
+     *
+     * Generated from protobuf field <code>.proto.api.YES_NO open_status = 5;</code>
+     * @return int
+     */
+    public function getOpenStatus()
+    {
+        return $this->open_status;
+    }
+
+    /**
+     * 开通状态
+     *
+     * Generated from protobuf field <code>.proto.api.YES_NO open_status = 5;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setOpenStatus($var)
+    {
+        GPBUtil::checkEnum($var, \Proto\Api\YES_NO::class);
+        $this->open_status = $var;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/PackageAreaEnt.php

@@ -28,24 +28,6 @@ class PackageAreaEnt extends \Google\Protobuf\Internal\Message
      * Generated from protobuf field <code>.proto.api.YES_NO open_status = 2;</code>
      */
     protected $open_status = 0;
-    /**
-     * 是否可以选中
-     *
-     * Generated from protobuf field <code>bool is_can_select = 3;</code>
-     */
-    protected $is_can_select = false;
-    /**
-     * 是否已经选中
-     *
-     * Generated from protobuf field <code>bool is_selected = 4;</code>
-     */
-    protected $is_selected = false;
-    /**
-     * 子级门店
-     *
-     * Generated from protobuf field <code>repeated .proto.api.PackageAreaEnt children = 5;</code>
-     */
-    private $children;
 
     /**
      * Constructor.
@@ -57,12 +39,6 @@ class PackageAreaEnt extends \Google\Protobuf\Internal\Message
      *           基本区县信息
      *     @type int $open_status
      *           开通状态
-     *     @type bool $is_can_select
-     *           是否可以选中
-     *     @type bool $is_selected
-     *           是否已经选中
-     *     @type array<\Proto\Api\PackageAreaEnt>|\Google\Protobuf\Internal\RepeatedField $children
-     *           子级门店
      * }
      */
     public function __construct($data = NULL) {
@@ -132,83 +108,5 @@ class PackageAreaEnt extends \Google\Protobuf\Internal\Message
         return $this;
     }
 
-    /**
-     * 是否可以选中
-     *
-     * Generated from protobuf field <code>bool is_can_select = 3;</code>
-     * @return bool
-     */
-    public function getIsCanSelect()
-    {
-        return $this->is_can_select;
-    }
-
-    /**
-     * 是否可以选中
-     *
-     * Generated from protobuf field <code>bool is_can_select = 3;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setIsCanSelect($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->is_can_select = $var;
-
-        return $this;
-    }
-
-    /**
-     * 是否已经选中
-     *
-     * Generated from protobuf field <code>bool is_selected = 4;</code>
-     * @return bool
-     */
-    public function getIsSelected()
-    {
-        return $this->is_selected;
-    }
-
-    /**
-     * 是否已经选中
-     *
-     * Generated from protobuf field <code>bool is_selected = 4;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setIsSelected($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->is_selected = $var;
-
-        return $this;
-    }
-
-    /**
-     * 子级门店
-     *
-     * Generated from protobuf field <code>repeated .proto.api.PackageAreaEnt children = 5;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getChildren()
-    {
-        return $this->children;
-    }
-
-    /**
-     * 子级门店
-     *
-     * Generated from protobuf field <code>repeated .proto.api.PackageAreaEnt children = 5;</code>
-     * @param array<\Proto\Api\PackageAreaEnt>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setChildren($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Proto\Api\PackageAreaEnt::class);
-        $this->children = $arr;
-
-        return $this;
-    }
-
 }
 

gen/php/Proto/Api/PreBuyMicroSoftReq.php

@@ -15,9 +15,23 @@ use Google\Protobuf\Internal\GPBUtil;
 class PreBuyMicroSoftReq extends \Google\Protobuf\Internal\Message
 {
     /**
-     * Generated from protobuf field <code>.proto.api.CityPackageOrderEnt data = 1;</code>
+     * 套餐编号
+     *
+     * Generated from protobuf field <code>string package_code = 1;</code>
      */
-    protected $data = null;
+    protected $package_code = '';
+    /**
+     * 购买数量
+     *
+     * Generated from protobuf field <code>int32 buy_num = 2;</code>
+     */
+    protected $buy_num = 0;
+    /**
+     * 支付方式
+     *
+     * Generated from protobuf field <code>.proto.api.PAY_METHOD pay_method = 3;</code>
+     */
+    protected $pay_method = 0;
 
     /**
      * Constructor.
@@ -25,7 +39,12 @@ class PreBuyMicroSoftReq extends \Google\Protobuf\Internal\Message
      * @param array $data {
      *     Optional. Data for populating the Message object.
      *
-     *     @type \Proto\Api\CityPackageOrderEnt $data
+     *     @type string $package_code
+     *           套餐编号
+     *     @type int $buy_num
+     *           购买数量
+     *     @type int $pay_method
+     *           支付方式
      * }
      */
     public function __construct($data = NULL) {
@@ -34,33 +53,79 @@ class PreBuyMicroSoftReq extends \Google\Protobuf\Internal\Message
     }
 
     /**
-     * Generated from protobuf field <code>.proto.api.CityPackageOrderEnt data = 1;</code>
-     * @return \Proto\Api\CityPackageOrderEnt|null
+     * 套餐编号
+     *
+     * Generated from protobuf field <code>string package_code = 1;</code>
+     * @return string
      */
-    public function getData()
+    public function getPackageCode()
     {
-        return $this->data;
+        return $this->package_code;
     }
 
-    public function hasData()
+    /**
+     * 套餐编号
+     *
+     * Generated from protobuf field <code>string package_code = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setPackageCode($var)
     {
-        return isset($this->data);
+        GPBUtil::checkString($var, True);
+        $this->package_code = $var;
+
+        return $this;
     }
 
-    public function clearData()
+    /**
+     * 购买数量
+     *
+     * Generated from protobuf field <code>int32 buy_num = 2;</code>
+     * @return int
+     */
+    public function getBuyNum()
     {
-        unset($this->data);
+        return $this->buy_num;
     }
 
     /**
-     * Generated from protobuf field <code>.proto.api.CityPackageOrderEnt data = 1;</code>
-     * @param \Proto\Api\CityPackageOrderEnt $var
+     * 购买数量
+     *
+     * Generated from protobuf field <code>int32 buy_num = 2;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setBuyNum($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->buy_num = $var;
+
+        return $this;
+    }
+
+    /**
+     * 支付方式
+     *
+     * Generated from protobuf field <code>.proto.api.PAY_METHOD pay_method = 3;</code>
+     * @return int
+     */
+    public function getPayMethod()
+    {
+        return $this->pay_method;
+    }
+
+    /**
+     * 支付方式
+     *
+     * Generated from protobuf field <code>.proto.api.PAY_METHOD pay_method = 3;</code>
+     * @param int $var
      * @return $this
      */
-    public function setData($var)
+    public function setPayMethod($var)
     {
-        GPBUtil::checkMessage($var, \Proto\Api\CityPackageOrderEnt::class);
-        $this->data = $var;
+        GPBUtil::checkEnum($var, \Proto\Api\PAY_METHOD::class);
+        $this->pay_method = $var;
 
         return $this;
     }

gen/php/Proto/Api/SubAreaListReq.php

@@ -0,0 +1,178 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackage.proto
+
+namespace Proto\Api;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>proto.api.SubAreaListReq</code>
+ */
+class SubAreaListReq extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * 分页参数
+     *
+     * Generated from protobuf field <code>.proto.api.PageArg page_arg = 1;</code>
+     */
+    protected $page_arg = null;
+    /**
+     * 省份CODE
+     *
+     * Generated from protobuf field <code>string province_code = 2;</code>
+     */
+    protected $province_code = '';
+    /**
+     * 城市CODE
+     *
+     * Generated from protobuf field <code>string city_code = 3;</code>
+     */
+    protected $city_code = '';
+    /**
+     * 门店ID
+     *
+     * Generated from protobuf field <code>int32 shop_id = 4;</code>
+     */
+    protected $shop_id = 0;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type \Proto\Api\PageArg $page_arg
+     *           分页参数
+     *     @type string $province_code
+     *           省份CODE
+     *     @type string $city_code
+     *           城市CODE
+     *     @type int $shop_id
+     *           门店ID
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * 分页参数
+     *
+     * Generated from protobuf field <code>.proto.api.PageArg page_arg = 1;</code>
+     * @return \Proto\Api\PageArg|null
+     */
+    public function getPageArg()
+    {
+        return $this->page_arg;
+    }
+
+    public function hasPageArg()
+    {
+        return isset($this->page_arg);
+    }
+
+    public function clearPageArg()
+    {
+        unset($this->page_arg);
+    }
+
+    /**
+     * 分页参数
+     *
+     * Generated from protobuf field <code>.proto.api.PageArg page_arg = 1;</code>
+     * @param \Proto\Api\PageArg $var
+     * @return $this
+     */
+    public function setPageArg($var)
+    {
+        GPBUtil::checkMessage($var, \Proto\Api\PageArg::class);
+        $this->page_arg = $var;
+
+        return $this;
+    }
+
+    /**
+     * 省份CODE
+     *
+     * Generated from protobuf field <code>string province_code = 2;</code>
+     * @return string
+     */
+    public function getProvinceCode()
+    {
+        return $this->province_code;
+    }
+
+    /**
+     * 省份CODE
+     *
+     * Generated from protobuf field <code>string province_code = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setProvinceCode($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->province_code = $var;
+
+        return $this;
+    }
+
+    /**
+     * 城市CODE
+     *
+     * Generated from protobuf field <code>string city_code = 3;</code>
+     * @return string
+     */
+    public function getCityCode()
+    {
+        return $this->city_code;
+    }
+
+    /**
+     * 城市CODE
+     *
+     * Generated from protobuf field <code>string city_code = 3;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setCityCode($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->city_code = $var;
+
+        return $this;
+    }
+
+    /**
+     * 门店ID
+     *
+     * Generated from protobuf field <code>int32 shop_id = 4;</code>
+     * @return int
+     */
+    public function getShopId()
+    {
+        return $this->shop_id;
+    }
+
+    /**
+     * 门店ID
+     *
+     * Generated from protobuf field <code>int32 shop_id = 4;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setShopId($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->shop_id = $var;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/SubAreaListRes.php

@@ -0,0 +1,100 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackage.proto
+
+namespace Proto\Api;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>proto.api.SubAreaListRes</code>
+ */
+class SubAreaListRes extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * 总条数
+     *
+     * Generated from protobuf field <code>int32 total = 1;</code>
+     */
+    protected $total = 0;
+    /**
+     * 列表
+     *
+     * Generated from protobuf field <code>repeated .proto.api.SubAreaListRes.SubItem list = 2;</code>
+     */
+    private $list;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type int $total
+     *           总条数
+     *     @type array<\Proto\Api\SubAreaListRes\SubItem>|\Google\Protobuf\Internal\RepeatedField $list
+     *           列表
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * 总条数
+     *
+     * Generated from protobuf field <code>int32 total = 1;</code>
+     * @return int
+     */
+    public function getTotal()
+    {
+        return $this->total;
+    }
+
+    /**
+     * 总条数
+     *
+     * Generated from protobuf field <code>int32 total = 1;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setTotal($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->total = $var;
+
+        return $this;
+    }
+
+    /**
+     * 列表
+     *
+     * Generated from protobuf field <code>repeated .proto.api.SubAreaListRes.SubItem list = 2;</code>
+     * @return \Google\Protobuf\Internal\RepeatedField
+     */
+    public function getList()
+    {
+        return $this->list;
+    }
+
+    /**
+     * 列表
+     *
+     * Generated from protobuf field <code>repeated .proto.api.SubAreaListRes.SubItem list = 2;</code>
+     * @param array<\Proto\Api\SubAreaListRes\SubItem>|\Google\Protobuf\Internal\RepeatedField $var
+     * @return $this
+     */
+    public function setList($var)
+    {
+        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Proto\Api\SubAreaListRes\SubItem::class);
+        $this->list = $arr;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/SubAreaListRes/SubItem.php

@@ -0,0 +1,202 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackage.proto
+
+namespace Proto\Api\SubAreaListRes;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>proto.api.SubAreaListRes.SubItem</code>
+ */
+class SubItem extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * 省份
+     *
+     * Generated from protobuf field <code>string province_name = 2;</code>
+     */
+    protected $province_name = '';
+    /**
+     * 城市
+     *
+     * Generated from protobuf field <code>string city_name = 3;</code>
+     */
+    protected $city_name = '';
+    /**
+     * 电池押金
+     *
+     * Generated from protobuf field <code>int32 battery_deposit = 4;</code>
+     */
+    protected $battery_deposit = 0;
+    /**
+     * 车辆押金
+     *
+     * Generated from protobuf field <code>int32 car_deposit = 5;</code>
+     */
+    protected $car_deposit = 0;
+    /**
+     * 车电一体押金
+     *
+     * Generated from protobuf field <code>int32 battery_car_deposit = 6;</code>
+     */
+    protected $battery_car_deposit = 0;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $province_name
+     *           省份
+     *     @type string $city_name
+     *           城市
+     *     @type int $battery_deposit
+     *           电池押金
+     *     @type int $car_deposit
+     *           车辆押金
+     *     @type int $battery_car_deposit
+     *           车电一体押金
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * 省份
+     *
+     * Generated from protobuf field <code>string province_name = 2;</code>
+     * @return string
+     */
+    public function getProvinceName()
+    {
+        return $this->province_name;
+    }
+
+    /**
+     * 省份
+     *
+     * Generated from protobuf field <code>string province_name = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setProvinceName($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->province_name = $var;
+
+        return $this;
+    }
+
+    /**
+     * 城市
+     *
+     * Generated from protobuf field <code>string city_name = 3;</code>
+     * @return string
+     */
+    public function getCityName()
+    {
+        return $this->city_name;
+    }
+
+    /**
+     * 城市
+     *
+     * Generated from protobuf field <code>string city_name = 3;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setCityName($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->city_name = $var;
+
+        return $this;
+    }
+
+    /**
+     * 电池押金
+     *
+     * Generated from protobuf field <code>int32 battery_deposit = 4;</code>
+     * @return int
+     */
+    public function getBatteryDeposit()
+    {
+        return $this->battery_deposit;
+    }
+
+    /**
+     * 电池押金
+     *
+     * Generated from protobuf field <code>int32 battery_deposit = 4;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setBatteryDeposit($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->battery_deposit = $var;
+
+        return $this;
+    }
+
+    /**
+     * 车辆押金
+     *
+     * Generated from protobuf field <code>int32 car_deposit = 5;</code>
+     * @return int
+     */
+    public function getCarDeposit()
+    {
+        return $this->car_deposit;
+    }
+
+    /**
+     * 车辆押金
+     *
+     * Generated from protobuf field <code>int32 car_deposit = 5;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setCarDeposit($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->car_deposit = $var;
+
+        return $this;
+    }
+
+    /**
+     * 车电一体押金
+     *
+     * Generated from protobuf field <code>int32 battery_car_deposit = 6;</code>
+     * @return int
+     */
+    public function getBatteryCarDeposit()
+    {
+        return $this->battery_car_deposit;
+    }
+
+    /**
+     * 车电一体押金
+     *
+     * Generated from protobuf field <code>int32 battery_car_deposit = 6;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setBatteryCarDeposit($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->battery_car_deposit = $var;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/SubRemoveAreaReq.php

@@ -0,0 +1,100 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackage.proto
+
+namespace Proto\Api;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>proto.api.SubRemoveAreaReq</code>
+ */
+class SubRemoveAreaReq extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * 门店ID
+     *
+     * Generated from protobuf field <code>int32 shop_id = 1;</code>
+     */
+    protected $shop_id = 0;
+    /**
+     * 地区area_ids
+     *
+     * Generated from protobuf field <code>repeated string area_ids = 2;</code>
+     */
+    private $area_ids;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type int $shop_id
+     *           门店ID
+     *     @type array<string>|\Google\Protobuf\Internal\RepeatedField $area_ids
+     *           地区area_ids
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * 门店ID
+     *
+     * Generated from protobuf field <code>int32 shop_id = 1;</code>
+     * @return int
+     */
+    public function getShopId()
+    {
+        return $this->shop_id;
+    }
+
+    /**
+     * 门店ID
+     *
+     * Generated from protobuf field <code>int32 shop_id = 1;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setShopId($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->shop_id = $var;
+
+        return $this;
+    }
+
+    /**
+     * 地区area_ids
+     *
+     * Generated from protobuf field <code>repeated string area_ids = 2;</code>
+     * @return \Google\Protobuf\Internal\RepeatedField
+     */
+    public function getAreaIds()
+    {
+        return $this->area_ids;
+    }
+
+    /**
+     * 地区area_ids
+     *
+     * Generated from protobuf field <code>repeated string area_ids = 2;</code>
+     * @param array<string>|\Google\Protobuf\Internal\RepeatedField $var
+     * @return $this
+     */
+    public function setAreaIds($var)
+    {
+        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING);
+        $this->area_ids = $arr;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/SubRemoveAreaRes.php

@@ -0,0 +1,32 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackage.proto
+
+namespace Proto\Api;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>proto.api.SubRemoveAreaRes</code>
+ */
+class SubRemoveAreaRes extends \Google\Protobuf\Internal\Message
+{
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+}
+

gen/php/Proto/Api/SubSelectAreaReq.php

@@ -0,0 +1,100 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackage.proto
+
+namespace Proto\Api;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>proto.api.SubSelectAreaReq</code>
+ */
+class SubSelectAreaReq extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * 门店ID
+     *
+     * Generated from protobuf field <code>int32 shop_id = 1;</code>
+     */
+    protected $shop_id = 0;
+    /**
+     * 地区area_ids
+     *
+     * Generated from protobuf field <code>repeated string area_ids = 2;</code>
+     */
+    private $area_ids;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type int $shop_id
+     *           门店ID
+     *     @type array<string>|\Google\Protobuf\Internal\RepeatedField $area_ids
+     *           地区area_ids
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * 门店ID
+     *
+     * Generated from protobuf field <code>int32 shop_id = 1;</code>
+     * @return int
+     */
+    public function getShopId()
+    {
+        return $this->shop_id;
+    }
+
+    /**
+     * 门店ID
+     *
+     * Generated from protobuf field <code>int32 shop_id = 1;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setShopId($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->shop_id = $var;
+
+        return $this;
+    }
+
+    /**
+     * 地区area_ids
+     *
+     * Generated from protobuf field <code>repeated string area_ids = 2;</code>
+     * @return \Google\Protobuf\Internal\RepeatedField
+     */
+    public function getAreaIds()
+    {
+        return $this->area_ids;
+    }
+
+    /**
+     * 地区area_ids
+     *
+     * Generated from protobuf field <code>repeated string area_ids = 2;</code>
+     * @param array<string>|\Google\Protobuf\Internal\RepeatedField $var
+     * @return $this
+     */
+    public function setAreaIds($var)
+    {
+        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING);
+        $this->area_ids = $arr;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/SubSelectAreaRes.php

@@ -0,0 +1,32 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackage.proto
+
+namespace Proto\Api;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>proto.api.SubSelectAreaRes</code>
+ */
+class SubSelectAreaRes extends \Google\Protobuf\Internal\Message
+{
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+}
+

gen/php/Proto/Api/SubShopListReq.php

@@ -0,0 +1,76 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackage.proto
+
+namespace Proto\Api;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>proto.api.SubShopListReq</code>
+ */
+class SubShopListReq extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * 分页参数
+     *
+     * Generated from protobuf field <code>.proto.api.PageArg page_arg = 1;</code>
+     */
+    protected $page_arg = null;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type \Proto\Api\PageArg $page_arg
+     *           分页参数
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * 分页参数
+     *
+     * Generated from protobuf field <code>.proto.api.PageArg page_arg = 1;</code>
+     * @return \Proto\Api\PageArg|null
+     */
+    public function getPageArg()
+    {
+        return $this->page_arg;
+    }
+
+    public function hasPageArg()
+    {
+        return isset($this->page_arg);
+    }
+
+    public function clearPageArg()
+    {
+        unset($this->page_arg);
+    }
+
+    /**
+     * 分页参数
+     *
+     * Generated from protobuf field <code>.proto.api.PageArg page_arg = 1;</code>
+     * @param \Proto\Api\PageArg $var
+     * @return $this
+     */
+    public function setPageArg($var)
+    {
+        GPBUtil::checkMessage($var, \Proto\Api\PageArg::class);
+        $this->page_arg = $var;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/SubShopListRes.php

@@ -0,0 +1,100 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackage.proto
+
+namespace Proto\Api;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>proto.api.SubShopListRes</code>
+ */
+class SubShopListRes extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * 总条数
+     *
+     * Generated from protobuf field <code>int32 total = 1;</code>
+     */
+    protected $total = 0;
+    /**
+     * 门店列表
+     *
+     * Generated from protobuf field <code>repeated .proto.api.SubShopListRes.SubShopListResItem list = 2;</code>
+     */
+    private $list;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type int $total
+     *           总条数
+     *     @type array<\Proto\Api\SubShopListRes\SubShopListResItem>|\Google\Protobuf\Internal\RepeatedField $list
+     *           门店列表
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * 总条数
+     *
+     * Generated from protobuf field <code>int32 total = 1;</code>
+     * @return int
+     */
+    public function getTotal()
+    {
+        return $this->total;
+    }
+
+    /**
+     * 总条数
+     *
+     * Generated from protobuf field <code>int32 total = 1;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setTotal($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->total = $var;
+
+        return $this;
+    }
+
+    /**
+     * 门店列表
+     *
+     * Generated from protobuf field <code>repeated .proto.api.SubShopListRes.SubShopListResItem list = 2;</code>
+     * @return \Google\Protobuf\Internal\RepeatedField
+     */
+    public function getList()
+    {
+        return $this->list;
+    }
+
+    /**
+     * 门店列表
+     *
+     * Generated from protobuf field <code>repeated .proto.api.SubShopListRes.SubShopListResItem list = 2;</code>
+     * @param array<\Proto\Api\SubShopListRes\SubShopListResItem>|\Google\Protobuf\Internal\RepeatedField $var
+     * @return $this
+     */
+    public function setList($var)
+    {
+        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Proto\Api\SubShopListRes\SubShopListResItem::class);
+        $this->list = $arr;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/SubShopListRes/SubShopListResItem.php

@@ -0,0 +1,280 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackage.proto
+
+namespace Proto\Api\SubShopListRes;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>proto.api.SubShopListRes.SubShopListResItem</code>
+ */
+class SubShopListResItem extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * 门店信息
+     *
+     * Generated from protobuf field <code>.proto.api.AdminBaseInfo shop_info = 1;</code>
+     */
+    protected $shop_info = null;
+    /**
+     * 省份
+     *
+     * Generated from protobuf field <code>string province_name = 2;</code>
+     */
+    protected $province_name = '';
+    /**
+     * 城市
+     *
+     * Generated from protobuf field <code>string city_name = 3;</code>
+     */
+    protected $city_name = '';
+    /**
+     * 电池押金
+     *
+     * Generated from protobuf field <code>int32 battery_deposit = 4;</code>
+     */
+    protected $battery_deposit = 0;
+    /**
+     * 车辆押金
+     *
+     * Generated from protobuf field <code>int32 car_deposit = 5;</code>
+     */
+    protected $car_deposit = 0;
+    /**
+     * 车电一体押金
+     *
+     * Generated from protobuf field <code>int32 battery_car_deposit = 6;</code>
+     */
+    protected $battery_car_deposit = 0;
+    /**
+     * 选择的城市列表
+     *
+     * Generated from protobuf field <code>repeated string area_ids = 7;</code>
+     */
+    private $area_ids;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type \Proto\Api\AdminBaseInfo $shop_info
+     *           门店信息
+     *     @type string $province_name
+     *           省份
+     *     @type string $city_name
+     *           城市
+     *     @type int $battery_deposit
+     *           电池押金
+     *     @type int $car_deposit
+     *           车辆押金
+     *     @type int $battery_car_deposit
+     *           车电一体押金
+     *     @type array<string>|\Google\Protobuf\Internal\RepeatedField $area_ids
+     *           选择的城市列表
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * 门店信息
+     *
+     * Generated from protobuf field <code>.proto.api.AdminBaseInfo shop_info = 1;</code>
+     * @return \Proto\Api\AdminBaseInfo|null
+     */
+    public function getShopInfo()
+    {
+        return $this->shop_info;
+    }
+
+    public function hasShopInfo()
+    {
+        return isset($this->shop_info);
+    }
+
+    public function clearShopInfo()
+    {
+        unset($this->shop_info);
+    }
+
+    /**
+     * 门店信息
+     *
+     * Generated from protobuf field <code>.proto.api.AdminBaseInfo shop_info = 1;</code>
+     * @param \Proto\Api\AdminBaseInfo $var
+     * @return $this
+     */
+    public function setShopInfo($var)
+    {
+        GPBUtil::checkMessage($var, \Proto\Api\AdminBaseInfo::class);
+        $this->shop_info = $var;
+
+        return $this;
+    }
+
+    /**
+     * 省份
+     *
+     * Generated from protobuf field <code>string province_name = 2;</code>
+     * @return string
+     */
+    public function getProvinceName()
+    {
+        return $this->province_name;
+    }
+
+    /**
+     * 省份
+     *
+     * Generated from protobuf field <code>string province_name = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setProvinceName($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->province_name = $var;
+
+        return $this;
+    }
+
+    /**
+     * 城市
+     *
+     * Generated from protobuf field <code>string city_name = 3;</code>
+     * @return string
+     */
+    public function getCityName()
+    {
+        return $this->city_name;
+    }
+
+    /**
+     * 城市
+     *
+     * Generated from protobuf field <code>string city_name = 3;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setCityName($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->city_name = $var;
+
+        return $this;
+    }
+
+    /**
+     * 电池押金
+     *
+     * Generated from protobuf field <code>int32 battery_deposit = 4;</code>
+     * @return int
+     */
+    public function getBatteryDeposit()
+    {
+        return $this->battery_deposit;
+    }
+
+    /**
+     * 电池押金
+     *
+     * Generated from protobuf field <code>int32 battery_deposit = 4;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setBatteryDeposit($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->battery_deposit = $var;
+
+        return $this;
+    }
+
+    /**
+     * 车辆押金
+     *
+     * Generated from protobuf field <code>int32 car_deposit = 5;</code>
+     * @return int
+     */
+    public function getCarDeposit()
+    {
+        return $this->car_deposit;
+    }
+
+    /**
+     * 车辆押金
+     *
+     * Generated from protobuf field <code>int32 car_deposit = 5;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setCarDeposit($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->car_deposit = $var;
+
+        return $this;
+    }
+
+    /**
+     * 车电一体押金
+     *
+     * Generated from protobuf field <code>int32 battery_car_deposit = 6;</code>
+     * @return int
+     */
+    public function getBatteryCarDeposit()
+    {
+        return $this->battery_car_deposit;
+    }
+
+    /**
+     * 车电一体押金
+     *
+     * Generated from protobuf field <code>int32 battery_car_deposit = 6;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setBatteryCarDeposit($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->battery_car_deposit = $var;
+
+        return $this;
+    }
+
+    /**
+     * 选择的城市列表
+     *
+     * Generated from protobuf field <code>repeated string area_ids = 7;</code>
+     * @return \Google\Protobuf\Internal\RepeatedField
+     */
+    public function getAreaIds()
+    {
+        return $this->area_ids;
+    }
+
+    /**
+     * 选择的城市列表
+     *
+     * Generated from protobuf field <code>repeated string area_ids = 7;</code>
+     * @param array<string>|\Google\Protobuf\Internal\RepeatedField $var
+     * @return $this
+     */
+    public function setAreaIds($var)
+    {
+        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING);
+        $this->area_ids = $arr;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/YES_NO.php

@@ -19,13 +19,13 @@ class YES_NO
      */
     const YES_NO_RESERVED = 0;
     /**
-     * 是/开通/真/拥有/有效
+     * 是/开通/真/拥有/有效/推荐
      *
      * Generated from protobuf enum <code>YES = 1;</code>
      */
     const YES = 1;
     /**
-     * 否/关闭/假/不拥有/无效
+     * 否/关闭/假/不拥有/无效/不推荐
      *
      * Generated from protobuf enum <code>NO = 2;</code>
      */

gen/swagger/api/CityPackage.swagger.json

@@ -19,7 +19,7 @@
   "paths": {
     "/cityPackage/area/all-area-level-list": {
       "post": {
-        "summary": "层级关系的所有地区列表",
+        "summary": "获取层级关系的树形结构地区数据  只有省和市两级",
         "operationId": "CityPackageService_AllAreaLevelList",
         "responses": {
           "200": {
@@ -59,7 +59,7 @@
     },
     "/cityPackage/area/area-list": {
       "post": {
-        "summary": "地区列表",
+        "summary": "主体门店开通的地区列表",
         "operationId": "CityPackageService_AreaList",
         "responses": {
           "200": {
@@ -99,7 +99,7 @@
     },
     "/cityPackage/area/close-area": {
       "post": {
-        "summary": "关闭地区",
+        "summary": "主体门店停用地区",
         "operationId": "CityPackageService_CloseArea",
         "responses": {
           "200": {
@@ -139,7 +139,7 @@
     },
     "/cityPackage/area/open-area": {
       "post": {
-        "summary": "开通地区",
+        "summary": "主体门店编辑地区",
         "operationId": "CityPackageService_OpenArea",
         "responses": {
           "200": {
@@ -177,15 +177,15 @@
         ]
       }
     },
-    "/cityPackage/car-model/car-model-add": {
+    "/cityPackage/area/sub-area-list": {
       "post": {
-        "summary": "添加车辆型号",
-        "operationId": "CityPackageService_CarModelAdd",
+        "summary": "子门店可选的地区列表",
+        "operationId": "CityPackageService_SubAreaList",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/apiCarModelAddRes"
+              "$ref": "#/definitions/apiSubAreaListRes"
             }
           },
           "default": {
@@ -201,7 +201,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/apiCarModelAddReq"
+              "$ref": "#/definitions/apiSubAreaListReq"
             }
           },
           {
@@ -209,7 +209,7 @@
             "description": "接口地址",
             "in": "query",
             "required": true,
-            "example": "cityPackage/car-model/car-model-add"
+            "example": "cityPackage/area/sub-area-list"
           }
         ],
         "tags": [
@@ -217,15 +217,15 @@
         ]
       }
     },
-    "/cityPackage/car-model/car-model-delete": {
+    "/cityPackage/area/sub-remove-area": {
       "post": {
-        "summary": "删除车辆型号",
-        "operationId": "CityPackageService_CarModelDelete",
+        "summary": "子门店移除地区",
+        "operationId": "CityPackageService_SubRemoveArea",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/apiCarModelDeleteRes"
+              "$ref": "#/definitions/apiSubRemoveAreaRes"
             }
           },
           "default": {
@@ -241,7 +241,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/apiCarModelDeleteReq"
+              "$ref": "#/definitions/apiSubRemoveAreaReq"
             }
           },
           {
@@ -249,7 +249,7 @@
             "description": "接口地址",
             "in": "query",
             "required": true,
-            "example": "cityPackage/car-model/car-model-delete"
+            "example": "cityPackage/area/sub-remove-area"
           }
         ],
         "tags": [
@@ -257,15 +257,15 @@
         ]
       }
     },
-    "/cityPackage/car-model/car-model-list": {
+    "/cityPackage/area/sub-select-area": {
       "post": {
-        "summary": "车辆型号列表",
-        "operationId": "CityPackageService_CarModelList",
+        "summary": "子门店选择地区",
+        "operationId": "CityPackageService_SubSelectArea",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/apiCarModelListRes"
+              "$ref": "#/definitions/apiSubSelectAreaRes"
             }
           },
           "default": {
@@ -281,7 +281,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/apiCarModelListReq"
+              "$ref": "#/definitions/apiSubSelectAreaReq"
             }
           },
           {
@@ -289,7 +289,47 @@
             "description": "接口地址",
             "in": "query",
             "required": true,
-            "example": "cityPackage/car-model/car-model-list"
+            "example": "cityPackage/area/sub-select-area"
+          }
+        ],
+        "tags": [
+          "API接口/后台/城市套餐"
+        ]
+      }
+    },
+    "/cityPackage/area/sub-shop-list": {
+      "post": {
+        "summary": "子门店列表",
+        "operationId": "CityPackageService_SubShopList",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/apiSubShopListRes"
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "$ref": "#/definitions/rpcStatus"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/apiSubShopListReq"
+            }
+          },
+          {
+            "name": "r",
+            "description": "接口地址",
+            "in": "query",
+            "required": true,
+            "example": "cityPackage/area/sub-shop-list"
           }
         ],
         "tags": [
@@ -377,15 +417,15 @@
         ]
       }
     },
-    "/cityPackage/city-package/edit-package": {
+    "/cityPackage/city-package/change-recommend": {
       "post": {
-        "summary": "编辑套餐",
-        "operationId": "CityPackageService_EditPackage",
+        "summary": "套餐的推荐变更",
+        "operationId": "CityPackageService_ChangeRecommend",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/apiEditPackageRes"
+              "$ref": "#/definitions/apiChangeRecommendRes"
             }
           },
           "default": {
@@ -401,7 +441,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/apiEditPackageReq"
+              "$ref": "#/definitions/apiChangeRecommendReq"
             }
           },
           {
@@ -409,7 +449,7 @@
             "description": "接口地址",
             "in": "query",
             "required": true,
-            "example": "cityPackage/city-package/edit-package"
+            "example": "cityPackage/city-package/change-recommend"
           }
         ],
         "tags": [
@@ -417,15 +457,15 @@
         ]
       }
     },
-    "/cityPackage/city-package/list-package": {
+    "/cityPackage/city-package/edit-package": {
       "post": {
-        "summary": "套餐列表",
-        "operationId": "CityPackageService_ListPackage",
+        "summary": "编辑套餐",
+        "operationId": "CityPackageService_EditPackage",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/apiListPackageRes"
+              "$ref": "#/definitions/apiEditPackageRes"
             }
           },
           "default": {
@@ -441,7 +481,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/apiListPackageReq"
+              "$ref": "#/definitions/apiEditPackageReq"
             }
           },
           {
@@ -449,7 +489,7 @@
             "description": "接口地址",
             "in": "query",
             "required": true,
-            "example": "cityPackage/city-package/list-package"
+            "example": "cityPackage/city-package/edit-package"
           }
         ],
         "tags": [
@@ -457,15 +497,15 @@
         ]
       }
     },
-    "/cityPackage/city-package/package-area-list": {
+    "/cityPackage/city-package/list-package": {
       "post": {
-        "summary": "套餐的地区使用范围",
-        "operationId": "CityPackageService_PackageAreaList",
+        "summary": "套餐列表",
+        "operationId": "CityPackageService_ListPackage",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/apiPackageAreaListRes"
+              "$ref": "#/definitions/apiListPackageRes"
             }
           },
           "default": {
@@ -481,7 +521,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/apiPackageAreaListReq"
+              "$ref": "#/definitions/apiListPackageReq"
             }
           },
           {
@@ -489,7 +529,7 @@
             "description": "接口地址",
             "in": "query",
             "required": true,
-            "example": "cityPackage/city-package/package-area-list"
+            "example": "cityPackage/city-package/list-package"
           }
         ],
         "tags": [
@@ -497,15 +537,15 @@
         ]
       }
     },
-    "/cityPackage/order/order-list": {
+    "/cityPackage/city-package/package-area-list": {
       "post": {
-        "summary": "订单列表",
-        "operationId": "CityPackageService_OrderList",
+        "summary": "套餐的地区使用范围",
+        "operationId": "CityPackageService_PackageAreaList",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/apiOrderListRes"
+              "$ref": "#/definitions/apiPackageAreaListRes"
             }
           },
           "default": {
@@ -521,7 +561,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/apiOrderListReq"
+              "$ref": "#/definitions/apiPackageAreaListReq"
             }
           },
           {
@@ -529,7 +569,7 @@
             "description": "接口地址",
             "in": "query",
             "required": true,
-            "example": "cityPackage/order/order-list"
+            "example": "cityPackage/city-package/package-area-list"
           }
         ],
         "tags": [
@@ -537,15 +577,15 @@
         ]
       }
     },
-    "/cityPackage/tag/add-tag": {
+    "/cityPackage/order/order-list": {
       "post": {
-        "summary": "添加标签",
-        "operationId": "CityPackageService_AddTag",
+        "summary": "订单列表",
+        "operationId": "CityPackageService_OrderList",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/apiAddTagRes"
+              "$ref": "#/definitions/apiOrderListRes"
             }
           },
           "default": {
@@ -561,7 +601,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/apiAddTagReq"
+              "$ref": "#/definitions/apiOrderListReq"
             }
           },
           {
@@ -569,7 +609,7 @@
             "description": "接口地址",
             "in": "query",
             "required": true,
-            "example": "cityPackage/tag/add-tag"
+            "example": "cityPackage/order/order-list"
           }
         ],
         "tags": [
@@ -579,17 +619,203 @@
     }
   },
   "definitions": {
-    "apiAddTagReq": {
+    "CityPackageAddReqAddItem": {
       "type": "object",
       "properties": {
-        "data": {
-          "$ref": "#/definitions/apiCityPackageTagEnt",
-          "title": "标签数据"
+        "name": {
+          "type": "string",
+          "title": "套餐名称"
+        },
+        "type": {
+          "$ref": "#/definitions/apiPackageType",
+          "title": "套餐类型"
+        },
+        "pledge": {
+          "type": "integer",
+          "format": "int32",
+          "title": "押金"
+        },
+        "total_day": {
+          "type": "integer",
+          "format": "int32",
+          "title": "天数"
+        },
+        "total_num": {
+          "type": "integer",
+          "format": "int32",
+          "title": "次数"
+        },
+        "show_money": {
+          "type": "integer",
+          "format": "int32",
+          "title": "套餐显示价格"
+        },
+        "money": {
+          "type": "integer",
+          "format": "int32",
+          "title": "套餐实际价格，元"
+        },
+        "exchange_money": {
+          "type": "integer",
+          "format": "int32",
+          "title": "单次换电价格，元"
+        },
+        "buy_limit": {
+          "type": "integer",
+          "format": "int32",
+          "title": "购买限制数量"
+        },
+        "listed_status": {
+          "$ref": "#/definitions/apiLISTED_STATUS",
+          "title": "上下架状态"
+        },
+        "stock": {
+          "type": "integer",
+          "format": "int32",
+          "title": "库存"
+        },
+        "package_category": {
+          "$ref": "#/definitions/apiDEVICE_USE_TYPE",
+          "title": "套餐分类 1租电套餐 2车电一体 3租车套餐"
+        },
+        "area_list": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "$ref": "#/definitions/apiAreaEnt"
+          },
+          "title": "支持的区县ID列表"
+        },
+        "battery_tag_info": {
+          "$ref": "#/definitions/apiEntTag",
+          "title": "电池标签信息"
+        },
+        "car_model_info": {
+          "$ref": "#/definitions/apiCarModelEnt",
+          "title": "车型信息"
         }
       }
     },
-    "apiAddTagRes": {
-      "type": "object"
+    "CityPackageOrderEntOrderInfoItem": {
+      "type": "object",
+      "properties": {
+        "base_info": {
+          "$ref": "#/definitions/apiEntOrder",
+          "title": "基础信息"
+        },
+        "current_battery_sn": {
+          "type": "string",
+          "title": "当前电池"
+        },
+        "battery_sn": {
+          "type": "string",
+          "title": "购买绑定的电池"
+        },
+        "remain_capacity": {
+          "type": "string",
+          "title": "剩余用量"
+        },
+        "pledge_status": {
+          "type": "integer",
+          "format": "int32",
+          "title": "押金状态 0待支付，1已支付，2免押，3无需支付 4 押金已退"
+        }
+      }
+    },
+    "OpenAreaReqOpenItem": {
+      "type": "object",
+      "properties": {
+        "area_id": {
+          "type": "string",
+          "title": "选择区域的id"
+        },
+        "battery_deposit": {
+          "type": "integer",
+          "format": "int32",
+          "title": "电池押金"
+        },
+        "car_deposit": {
+          "type": "integer",
+          "format": "int32",
+          "title": "车辆押金"
+        },
+        "battery_car_deposit": {
+          "type": "integer",
+          "format": "int32",
+          "title": "车电一体押金"
+        },
+        "open_status": {
+          "$ref": "#/definitions/apiYES_NO",
+          "title": "开通状态"
+        }
+      }
+    },
+    "SubAreaListResSubItem": {
+      "type": "object",
+      "properties": {
+        "province_name": {
+          "type": "string",
+          "title": "省份"
+        },
+        "city_name": {
+          "type": "string",
+          "title": "城市"
+        },
+        "battery_deposit": {
+          "type": "integer",
+          "format": "int32",
+          "title": "电池押金"
+        },
+        "car_deposit": {
+          "type": "integer",
+          "format": "int32",
+          "title": "车辆押金"
+        },
+        "battery_car_deposit": {
+          "type": "integer",
+          "format": "int32",
+          "title": "车电一体押金"
+        }
+      }
+    },
+    "SubShopListResSubShopListResItem": {
+      "type": "object",
+      "properties": {
+        "shop_info": {
+          "$ref": "#/definitions/apiAdminBaseInfo",
+          "title": "门店信息"
+        },
+        "province_name": {
+          "type": "string",
+          "title": "省份"
+        },
+        "city_name": {
+          "type": "string",
+          "title": "城市"
+        },
+        "battery_deposit": {
+          "type": "integer",
+          "format": "int32",
+          "title": "电池押金"
+        },
+        "car_deposit": {
+          "type": "integer",
+          "format": "int32",
+          "title": "车辆押金"
+        },
+        "battery_car_deposit": {
+          "type": "integer",
+          "format": "int32",
+          "title": "车电一体押金"
+        },
+        "area_ids": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "title": "选择的城市列表"
+        }
+      }
     },
     "apiAdminBaseInfo": {
       "type": "object",
@@ -674,28 +900,17 @@
           "$ref": "#/definitions/apiPageArg",
           "title": "分页参数"
         },
-        "package_area_arg": {
-          "$ref": "#/definitions/apiPackageAreaEnt",
-          "title": "筛选参数"
-        },
-        "is_child_query": {
-          "type": "boolean",
-          "title": "子门店查询 默认false"
-        },
-        "min_level": {
-          "type": "integer",
-          "format": "int32",
-          "title": "最小层级 1省级  2市级  3县级"
+        "open_status": {
+          "$ref": "#/definitions/apiYES_NO",
+          "title": "开通状态"
         },
-        "level": {
-          "type": "integer",
-          "format": "int32",
-          "title": "查询的层级"
+        "province_code": {
+          "type": "string",
+          "title": "省份CODE"
         },
-        "admin_id": {
-          "type": "integer",
-          "format": "int32",
-          "title": "门店"
+        "city_code": {
+          "type": "string",
+          "title": "城市CODE"
         }
       }
     },
@@ -717,33 +932,6 @@
         }
       }
     },
-    "apiCarModelAddReq": {
-      "type": "object",
-      "properties": {
-        "data": {
-          "$ref": "#/definitions/apiCityPackageCarModelEnt",
-          "title": "数据"
-        }
-      }
-    },
-    "apiCarModelAddRes": {
-      "type": "object"
-    },
-    "apiCarModelDeleteReq": {
-      "type": "object",
-      "properties": {
-        "codes": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "title": "车辆型号编号数组列表"
-        }
-      }
-    },
-    "apiCarModelDeleteRes": {
-      "type": "object"
-    },
     "apiCarModelEnt": {
       "type": "object",
       "properties": {
@@ -772,38 +960,26 @@
         }
       }
     },
-    "apiCarModelListReq": {
-      "type": "object",
-      "properties": {
-        "page_arg": {
-          "$ref": "#/definitions/apiPageArg",
-          "title": "分页参数"
-        },
-        "shop_arg": {
-          "$ref": "#/definitions/apiShopArg",
-          "title": "门店筛选参数"
-        }
-      }
-    },
-    "apiCarModelListRes": {
+    "apiChangeListedStatusReq": {
       "type": "object",
       "properties": {
-        "total": {
-          "type": "integer",
-          "format": "int32",
-          "title": "条数"
-        },
-        "list": {
+        "package_code": {
           "type": "array",
           "items": {
-            "type": "object",
-            "$ref": "#/definitions/apiCityPackageCarModelEnt"
+            "type": "string"
           },
-          "title": "数据"
+          "title": "套餐code"
+        },
+        "status": {
+          "$ref": "#/definitions/apiLISTED_STATUS",
+          "title": "更新的状态"
         }
       }
     },
-    "apiChangeListedStatusReq": {
+    "apiChangeListedStatusRes": {
+      "type": "object"
+    },
+    "apiChangeRecommendReq": {
       "type": "object",
       "properties": {
         "package_code": {
@@ -813,13 +989,13 @@
           },
           "title": "套餐code"
         },
-        "status": {
-          "$ref": "#/definitions/apiLISTED_STATUS",
-          "title": "更新的状态"
+        "is_recommend": {
+          "$ref": "#/definitions/apiYES_NO",
+          "title": "是否推荐"
         }
       }
     },
-    "apiChangeListedStatusRes": {
+    "apiChangeRecommendRes": {
       "type": "object"
     },
     "apiCityPackageAddReq": {
@@ -834,7 +1010,7 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/apiCityPackageEnt"
+            "$ref": "#/definitions/CityPackageAddReqAddItem"
           },
           "title": "套餐数组列表"
         },
@@ -864,19 +1040,6 @@
         }
       }
     },
-    "apiCityPackageCarModelEnt": {
-      "type": "object",
-      "properties": {
-        "car_model_info": {
-          "$ref": "#/definitions/apiCarModelEnt",
-          "title": "车型信息"
-        },
-        "shop_info": {
-          "$ref": "#/definitions/apiEntAdmin",
-          "title": "所属门店信息"
-        }
-      }
-    },
     "apiCityPackageEnt": {
       "type": "object",
       "properties": {
@@ -907,6 +1070,10 @@
         "shop_info": {
           "$ref": "#/definitions/apiEntAdmin",
           "title": "门店信息"
+        },
+        "is_recommend": {
+          "$ref": "#/definitions/apiYES_NO",
+          "title": "是否是推荐"
         }
       },
       "title": "城市套餐的信息"
@@ -915,8 +1082,8 @@
       "type": "object",
       "properties": {
         "order_info": {
-          "$ref": "#/definitions/apiEntOrder",
-          "title": "基本订单信息"
+          "$ref": "#/definitions/CityPackageOrderEntOrderInfoItem",
+          "title": "订单信息"
         },
         "insurance_info": {
           "type": "string",
@@ -929,16 +1096,6 @@
       },
       "title": "城市套餐订单实体"
     },
-    "apiCityPackageTagEnt": {
-      "type": "object",
-      "properties": {
-        "tag_info": {
-          "$ref": "#/definitions/apiEntTag",
-          "title": "标签基本信息"
-        }
-      },
-      "title": "城市套餐的标签"
-    },
     "apiCloseAreaReq": {
       "type": "object",
       "properties": {
@@ -948,10 +1105,6 @@
             "type": "string"
           },
           "title": "地区CODE列表"
-        },
-        "is_child_opt": {
-          "type": "boolean",
-          "title": "是否子门店操作关闭 默认false"
         }
       }
     },
@@ -1044,6 +1197,11 @@
         "order_source": {
           "$ref": "#/definitions/apiREQUEST_SOURCE",
           "title": "订单来源"
+        },
+        "pay_status": {
+          "type": "integer",
+          "format": "int32",
+          "title": "支付状态"
         }
       },
       "title": "订单实体"
@@ -1203,16 +1361,13 @@
     "apiOpenAreaReq": {
       "type": "object",
       "properties": {
-        "area_ids": {
+        "list": {
           "type": "array",
           "items": {
-            "type": "string"
+            "type": "object",
+            "$ref": "#/definitions/OpenAreaReqOpenItem"
           },
-          "title": "地区CODE列表"
-        },
-        "is_child_opt": {
-          "type": "boolean",
-          "title": "是否子门店操作开通 默认false"
+          "title": "开通的地区"
         }
       }
     },
@@ -1290,22 +1445,6 @@
         "open_status": {
           "$ref": "#/definitions/apiYES_NO",
           "title": "开通状态"
-        },
-        "is_can_select": {
-          "type": "boolean",
-          "title": "是否可以选中"
-        },
-        "is_selected": {
-          "type": "boolean",
-          "title": "是否已经选中"
-        },
-        "children": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "$ref": "#/definitions/apiPackageAreaEnt"
-          },
-          "title": "子级门店"
         }
       },
       "title": "套餐开通的地区"
@@ -1401,6 +1540,113 @@
       },
       "title": "门店筛选参数"
     },
+    "apiSubAreaListReq": {
+      "type": "object",
+      "properties": {
+        "page_arg": {
+          "$ref": "#/definitions/apiPageArg",
+          "title": "分页参数"
+        },
+        "province_code": {
+          "type": "string",
+          "title": "省份CODE"
+        },
+        "city_code": {
+          "type": "string",
+          "title": "城市CODE"
+        },
+        "shop_id": {
+          "type": "integer",
+          "format": "int32",
+          "title": "门店ID"
+        }
+      }
+    },
+    "apiSubAreaListRes": {
+      "type": "object",
+      "properties": {
+        "total": {
+          "type": "integer",
+          "format": "int32",
+          "title": "总条数"
+        },
+        "list": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "$ref": "#/definitions/SubAreaListResSubItem"
+          },
+          "title": "列表"
+        }
+      }
+    },
+    "apiSubRemoveAreaReq": {
+      "type": "object",
+      "properties": {
+        "shop_id": {
+          "type": "integer",
+          "format": "int32",
+          "title": "门店ID"
+        },
+        "area_ids": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "title": "地区area_ids"
+        }
+      }
+    },
+    "apiSubRemoveAreaRes": {
+      "type": "object"
+    },
+    "apiSubSelectAreaReq": {
+      "type": "object",
+      "properties": {
+        "shop_id": {
+          "type": "integer",
+          "format": "int32",
+          "title": "门店ID"
+        },
+        "area_ids": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "title": "地区area_ids"
+        }
+      }
+    },
+    "apiSubSelectAreaRes": {
+      "type": "object"
+    },
+    "apiSubShopListReq": {
+      "type": "object",
+      "properties": {
+        "page_arg": {
+          "$ref": "#/definitions/apiPageArg",
+          "title": "分页参数"
+        }
+      }
+    },
+    "apiSubShopListRes": {
+      "type": "object",
+      "properties": {
+        "total": {
+          "type": "integer",
+          "format": "int32",
+          "title": "总条数"
+        },
+        "list": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "$ref": "#/definitions/SubShopListResSubShopListResItem"
+          },
+          "title": "门店列表"
+        }
+      }
+    },
     "apiUserBaseInfo": {
       "type": "object",
       "properties": {
@@ -1428,7 +1674,7 @@
         "NO"
       ],
       "default": "YES_NO_RESERVED",
-      "title": "- YES_NO_RESERVED: 保留\n - YES: 是/开通/真/拥有/有效\n - NO: 否/关闭/假/不拥有/无效"
+      "title": "- YES_NO_RESERVED: 保留\n - YES: 是/开通/真/拥有/有效/推荐\n - NO: 否/关闭/假/不拥有/无效/不推荐"
     },
     "protobufAny": {
       "type": "object",

gen/swagger/api/CityPackageMicroSoft.swagger.json

@@ -179,6 +179,32 @@
     }
   },
   "definitions": {
+    "CityPackageOrderEntOrderInfoItem": {
+      "type": "object",
+      "properties": {
+        "base_info": {
+          "$ref": "#/definitions/apiEntOrder",
+          "title": "基础信息"
+        },
+        "current_battery_sn": {
+          "type": "string",
+          "title": "当前电池"
+        },
+        "battery_sn": {
+          "type": "string",
+          "title": "购买绑定的电池"
+        },
+        "remain_capacity": {
+          "type": "string",
+          "title": "剩余用量"
+        },
+        "pledge_status": {
+          "type": "integer",
+          "format": "int32",
+          "title": "押金状态 0待支付，1已支付，2免押，3无需支付 4 押金已退"
+        }
+      }
+    },
     "apiAdminBaseInfo": {
       "type": "object",
       "properties": {
@@ -284,6 +310,10 @@
         "shop_info": {
           "$ref": "#/definitions/apiEntAdmin",
           "title": "门店信息"
+        },
+        "is_recommend": {
+          "$ref": "#/definitions/apiYES_NO",
+          "title": "是否是推荐"
         }
       },
       "title": "城市套餐的信息"
@@ -292,8 +322,8 @@
       "type": "object",
       "properties": {
         "order_info": {
-          "$ref": "#/definitions/apiEntOrder",
-          "title": "基本订单信息"
+          "$ref": "#/definitions/CityPackageOrderEntOrderInfoItem",
+          "title": "订单信息"
         },
         "insurance_info": {
           "type": "string",
@@ -399,6 +429,11 @@
         "order_source": {
           "$ref": "#/definitions/apiREQUEST_SOURCE",
           "title": "订单来源"
+        },
+        "pay_status": {
+          "type": "integer",
+          "format": "int32",
+          "title": "支付状态"
         }
       },
       "title": "订单实体"
@@ -627,8 +662,18 @@
     "apiPreBuyMicroSoftReq": {
       "type": "object",
       "properties": {
-        "data": {
-          "$ref": "#/definitions/apiCityPackageOrderEnt"
+        "package_code": {
+          "type": "string",
+          "title": "套餐编号"
+        },
+        "buy_num": {
+          "type": "integer",
+          "format": "int32",
+          "title": "购买数量"
+        },
+        "pay_method": {
+          "$ref": "#/definitions/apiPAY_METHOD",
+          "title": "支付方式"
         }
       }
     },
@@ -679,6 +724,16 @@
       },
       "title": "用户的基本信息"
     },
+    "apiYES_NO": {
+      "type": "string",
+      "enum": [
+        "YES_NO_RESERVED",
+        "YES",
+        "NO"
+      ],
+      "default": "YES_NO_RESERVED",
+      "title": "- YES_NO_RESERVED: 保留\n - YES: 是/开通/真/拥有/有效/推荐\n - NO: 否/关闭/假/不拥有/无效/不推荐"
+    },
     "protobufAny": {
       "type": "object",
       "properties": {