1

api/CityPackage.proto

@@ -29,6 +29,14 @@ service CityPackageService {
     };
   };
 
+  // 编辑套餐
+  rpc EditPackage(EditPackageReq) returns (EditPackageRes) {
+    option (google.api.http) = {
+        post : "/cityPackage/city-package/edit-package",
+        body : "*",
+    };
+  };
+
   // 套餐改变上下架状态
   rpc ChangeListedStatus(ChangeListedStatusReq) returns (ChangeListedStatusRes) {
     option (google.api.http) = {
@@ -110,6 +118,14 @@ service CityPackageService {
     };
   }
 
+  // 层级关系的所有地区列表
+  rpc AllAreaLevelList(AllAreaLevelListReq) returns (AllAreaLevelListRes) {
+    option (google.api.http) = {
+        post : "/cityPackage/area/all-area-level-list",
+        body : "*",
+    };
+  }
+
   // 开通地区
   rpc OpenArea(OpenAreaReq) returns (OpenAreaRes) {
     option (google.api.http) = {
@@ -134,8 +150,16 @@ message CityPackageAddReq {
   int32 shop_id = 1;
   // 套餐数组列表
   repeated CityPackageEnt package_list = 2;
+  // 套餐分类 1租电套餐 2车电一体 3租车套餐
+  DEVICE_USE_TYPE package_category = 3;
 }
 message CityPackageAddRes {
+  // 失败的数量
+  int32 fail_count = 1;
+  // 成功的数量
+  int32 success_count = 2;
+  // 总请求添加数量
+  int32 total_count = 3;
 }
 
 message CarModelAddReq {
@@ -196,6 +220,8 @@ message ListPackageReq {
   ShopArg shop_arg = 2;
   // 套餐分类
   DEVICE_USE_TYPE package_category = 3;
+  // 上下架状态
+  LISTED_STATUS listed_status = 4;
 }
 message ListPackageRes {
   // 总条数
@@ -232,6 +258,14 @@ 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;
 }
 message AreaListRes {
   // 总条数
@@ -243,6 +277,8 @@ message AreaListRes {
 message OpenAreaReq {
   // 地区CODE列表
   repeated string area_ids = 1;
+  // 是否子门店操作开通 默认false
+  bool is_child_opt = 3;
 }
 
 message OpenAreaRes {
@@ -251,7 +287,24 @@ 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 {
 }

api/EntArea.proto

@@ -26,4 +26,11 @@ message AreaEnt{
   string area_name = 6;
   // 地区code
   string area_id = 7;
+}
+
+message AreaLevelEnt {
+  // 区域信息
+  AreaEnt area_info = 1;
+  // 子级区域
+  repeated AreaLevelEnt children = 2;
 }

api/EntCityPackage.proto

@@ -10,6 +10,7 @@ import "api/Common.proto";
 import "api/EntOrder.proto";
 import "api/EntTag.proto";
 import "api/EntCommon.proto";
+import "api/EntAdmin.proto";
 import "api/EntCarModel.proto";
 
 option go_package = "api/v1";
@@ -48,6 +49,8 @@ message CityPackageEnt {
   EntTag battery_tag_info = 4;
   // 车型信息
   CarModelEnt car_model_info = 5;
+  // 门店信息
+  EntAdmin shop_info = 6;
 }
 
 // 套餐开通的地区
@@ -56,4 +59,10 @@ 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/EntPackage.proto

@@ -46,4 +46,12 @@ message EntPackage {
   LISTED_STATUS listed_status = 10;
   // 套餐code
   string code = 11;
+  // 库存
+  int32 stock = 12;
+  // 创建时间 时间戳 秒
+  int32 ctime = 13;
+  // 更新时间 时间戳 秒
+  int32 utime = 14;
+  // 删除时间 时间戳 秒
+  int32 dtime = 15;
 }

gen/php/GPBMetadata/Api/EntArea.php

@@ -17,7 +17,7 @@ class EntArea
         }
         \GPBMetadata\ProtocGenOpenapiv2\Options\Annotations::initOnce();
         $pool->internalAddGeneratedFile(
-            "\x0A\x89\x02\x0A\x11api/EntArea.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\"\x94\x01\x0A\x07AreaEnt\x12\x15\x0A\x0Dprovince_code\x18\x01 \x01(\x09\x12\x15\x0A\x0Dprovince_name\x18\x02 \x01(\x09\x12\x11\x0A\x09city_code\x18\x03 \x01(\x09\x12\x11\x0A\x09city_name\x18\x04 \x01(\x09\x12\x11\x0A\x09area_code\x18\x05 \x01(\x09\x12\x11\x0A\x09area_name\x18\x06 \x01(\x09\x12\x0F\x0A\x07area_id\x18\x07 \x01(\x09B(Z\x06api/v1\x92A\x1D\x12\x1B\x0A\x0C\xE5\x9C\xB0\xE5\x8C\xBA\xE5\xAE\x9E\xE4\xBD\x93\x12\x06\xE5\xAE\x9E\xE4\xBD\x932\x031.0b\x06proto3"
+            "\x0A\xEB\x02\x0A\x11api/EntArea.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\"\x94\x01\x0A\x07AreaEnt\x12\x15\x0A\x0Dprovince_code\x18\x01 \x01(\x09\x12\x15\x0A\x0Dprovince_name\x18\x02 \x01(\x09\x12\x11\x0A\x09city_code\x18\x03 \x01(\x09\x12\x11\x0A\x09city_name\x18\x04 \x01(\x09\x12\x11\x0A\x09area_code\x18\x05 \x01(\x09\x12\x11\x0A\x09area_name\x18\x06 \x01(\x09\x12\x0F\x0A\x07area_id\x18\x07 \x01(\x09\"`\x0A\x0CAreaLevelEnt\x12%\x0A\x09area_info\x18\x01 \x01(\x0B2\x12.proto.api.AreaEnt\x12)\x0A\x08children\x18\x02 \x03(\x0B2\x17.proto.api.AreaLevelEntB(Z\x06api/v1\x92A\x1D\x12\x1B\x0A\x0C\xE5\x9C\xB0\xE5\x8C\xBA\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/EntCityPackage.php

@@ -22,9 +22,10 @@ class EntCityPackage
         \GPBMetadata\Api\EntOrder::initOnce();
         \GPBMetadata\Api\EntTag::initOnce();
         \GPBMetadata\Api\EntCommon::initOnce();
+        \GPBMetadata\Api\EntAdmin::initOnce();
         \GPBMetadata\Api\EntCarModel::initOnce();
         $pool->internalAddGeneratedFile(
-            "\x0A\xB0\x06\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\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\"\xF7\x01\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\"_\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"
+            "\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"
         , true);
 
         static::$is_initialized = true;

gen/php/GPBMetadata/Api/EntPackage.php

@@ -18,7 +18,7 @@ class EntPackage
         \GPBMetadata\ProtocGenOpenapiv2\Options\Annotations::initOnce();
         \GPBMetadata\Api\Common::initOnce();
         $pool->internalAddGeneratedFile(
-            "\x0A\xFD\x03\x0A\x14api/EntPackage.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\x1A\x10api/Common.proto\"\x83\x02\x0A\x0AEntPackage\x12\x0C\x0A\x04name\x18\x01 \x01(\x09\x12\$\x0A\x04type\x18\x02 \x01(\x0E2\x16.proto.api.PackageType\x12\x0E\x0A\x06pledge\x18\x03 \x01(\x05\x12\x11\x0A\x09total_day\x18\x04 \x01(\x05\x12\x11\x0A\x09total_num\x18\x05 \x01(\x05\x12\x12\x0A\x0Ashow_money\x18\x06 \x01(\x05\x12\x0D\x0A\x05money\x18\x07 \x01(\x05\x12\x16\x0A\x0Eexchange_money\x18\x08 \x01(\x05\x12\x11\x0A\x09buy_limit\x18\x09 \x01(\x05\x12/\x0A\x0Dlisted_status\x18\x0A \x01(\x0E2\x18.proto.api.LISTED_STATUS\x12\x0C\x0A\x04code\x18\x0B \x01(\x09*n\x0A\x0BPackageType\x12\x19\x0A\x15PACKAGE_TYPE_RESERVED\x10\x00\x12\x14\x0A\x10PACKAGE_TYPE_DAY\x10\x01\x12\x14\x0A\x10PACKAGE_TYPE_NUM\x10\x02\x12\x18\x0A\x14PACKAGE_TYPE_DAY_NUM\x10\x03B(Z\x06api/v1\x92A\x1D\x12\x1B\x0A\x0C\xE5\xA5\x97\xE9\xA4\x90\xE5\xAE\x9E\xE4\xBD\x93\x12\x06\xE5\xAE\x9E\xE4\xBD\x932\x031.0b\x06proto3"
+            "\x0A\xB9\x04\x0A\x14api/EntPackage.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\x1A\x10api/Common.proto\"\xBF\x02\x0A\x0AEntPackage\x12\x0C\x0A\x04name\x18\x01 \x01(\x09\x12\$\x0A\x04type\x18\x02 \x01(\x0E2\x16.proto.api.PackageType\x12\x0E\x0A\x06pledge\x18\x03 \x01(\x05\x12\x11\x0A\x09total_day\x18\x04 \x01(\x05\x12\x11\x0A\x09total_num\x18\x05 \x01(\x05\x12\x12\x0A\x0Ashow_money\x18\x06 \x01(\x05\x12\x0D\x0A\x05money\x18\x07 \x01(\x05\x12\x16\x0A\x0Eexchange_money\x18\x08 \x01(\x05\x12\x11\x0A\x09buy_limit\x18\x09 \x01(\x05\x12/\x0A\x0Dlisted_status\x18\x0A \x01(\x0E2\x18.proto.api.LISTED_STATUS\x12\x0C\x0A\x04code\x18\x0B \x01(\x09\x12\x0D\x0A\x05stock\x18\x0C \x01(\x05\x12\x0D\x0A\x05ctime\x18\x0D \x01(\x05\x12\x0D\x0A\x05utime\x18\x0E \x01(\x05\x12\x0D\x0A\x05dtime\x18\x0F \x01(\x05*n\x0A\x0BPackageType\x12\x19\x0A\x15PACKAGE_TYPE_RESERVED\x10\x00\x12\x14\x0A\x10PACKAGE_TYPE_DAY\x10\x01\x12\x14\x0A\x10PACKAGE_TYPE_NUM\x10\x02\x12\x18\x0A\x14PACKAGE_TYPE_DAY_NUM\x10\x03B(Z\x06api/v1\x92A\x1D\x12\x1B\x0A\x0C\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/Proto/Api/AllAreaLevelListReq.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.AllAreaLevelListReq</code>
+ */
+class AllAreaLevelListReq 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/AllAreaLevelListRes.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.AllAreaLevelListRes</code>
+ */
+class AllAreaLevelListRes extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * 省列表
+     *
+     * Generated from protobuf field <code>.proto.api.AreaLevelEnt list = 1;</code>
+     */
+    protected $list = null;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type \Proto\Api\AreaLevelEnt $list
+     *           省列表
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * 省列表
+     *
+     * Generated from protobuf field <code>.proto.api.AreaLevelEnt list = 1;</code>
+     * @return \Proto\Api\AreaLevelEnt|null
+     */
+    public function getList()
+    {
+        return $this->list;
+    }
+
+    public function hasList()
+    {
+        return isset($this->list);
+    }
+
+    public function clearList()
+    {
+        unset($this->list);
+    }
+
+    /**
+     * 省列表
+     *
+     * Generated from protobuf field <code>.proto.api.AreaLevelEnt list = 1;</code>
+     * @param \Proto\Api\AreaLevelEnt $var
+     * @return $this
+     */
+    public function setList($var)
+    {
+        GPBUtil::checkMessage($var, \Proto\Api\AreaLevelEnt::class);
+        $this->list = $var;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/AreaLevelEnt.php

@@ -0,0 +1,110 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/EntArea.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.AreaLevelEnt</code>
+ */
+class AreaLevelEnt extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * 区域信息
+     *
+     * Generated from protobuf field <code>.proto.api.AreaEnt area_info = 1;</code>
+     */
+    protected $area_info = null;
+    /**
+     * 子级区域
+     *
+     * Generated from protobuf field <code>repeated .proto.api.AreaLevelEnt children = 2;</code>
+     */
+    private $children;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type \Proto\Api\AreaEnt $area_info
+     *           区域信息
+     *     @type array<\Proto\Api\AreaLevelEnt>|\Google\Protobuf\Internal\RepeatedField $children
+     *           子级区域
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\EntArea::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * 区域信息
+     *
+     * Generated from protobuf field <code>.proto.api.AreaEnt area_info = 1;</code>
+     * @return \Proto\Api\AreaEnt|null
+     */
+    public function getAreaInfo()
+    {
+        return $this->area_info;
+    }
+
+    public function hasAreaInfo()
+    {
+        return isset($this->area_info);
+    }
+
+    public function clearAreaInfo()
+    {
+        unset($this->area_info);
+    }
+
+    /**
+     * 区域信息
+     *
+     * Generated from protobuf field <code>.proto.api.AreaEnt area_info = 1;</code>
+     * @param \Proto\Api\AreaEnt $var
+     * @return $this
+     */
+    public function setAreaInfo($var)
+    {
+        GPBUtil::checkMessage($var, \Proto\Api\AreaEnt::class);
+        $this->area_info = $var;
+
+        return $this;
+    }
+
+    /**
+     * 子级区域
+     *
+     * Generated from protobuf field <code>repeated .proto.api.AreaLevelEnt children = 2;</code>
+     * @return \Google\Protobuf\Internal\RepeatedField
+     */
+    public function getChildren()
+    {
+        return $this->children;
+    }
+
+    /**
+     * 子级区域
+     *
+     * Generated from protobuf field <code>repeated .proto.api.AreaLevelEnt children = 2;</code>
+     * @param array<\Proto\Api\AreaLevelEnt>|\Google\Protobuf\Internal\RepeatedField $var
+     * @return $this
+     */
+    public function setChildren($var)
+    {
+        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Proto\Api\AreaLevelEnt::class);
+        $this->children = $arr;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/AreaListReq.php

@@ -26,6 +26,30 @@ class AreaListReq extends \Google\Protobuf\Internal\Message
      * Generated from protobuf field <code>.proto.api.PackageAreaEnt package_area_arg = 2;</code>
      */
     protected $package_area_arg = null;
+    /**
+     * 子门店查询 默认false
+     *
+     * Generated from protobuf field <code>bool is_child_query = 3;</code>
+     */
+    protected $is_child_query = false;
+    /**
+     * 最小层级 1省级  2市级  3县级
+     *
+     * Generated from protobuf field <code>int32 min_level = 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;
 
     /**
      * Constructor.
@@ -37,6 +61,14 @@ class AreaListReq extends \Google\Protobuf\Internal\Message
      *           分页参数
      *     @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
+     *           门店
      * }
      */
     public function __construct($data = NULL) {
@@ -116,5 +148,109 @@ class AreaListReq extends \Google\Protobuf\Internal\Message
         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>
+     * @return int
+     */
+    public function getMinLevel()
+    {
+        return $this->min_level;
+    }
+
+    /**
+     * 最小层级 1省级  2市级  3县级
+     *
+     * Generated from protobuf field <code>int32 min_level = 4;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setMinLevel($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->min_level = $var;
+
+        return $this;
+    }
+
+    /**
+     * 查询的层级
+     *
+     * Generated from protobuf field <code>int32 level = 5;</code>
+     * @return int
+     */
+    public function getLevel()
+    {
+        return $this->level;
+    }
+
+    /**
+     * 查询的层级
+     *
+     * Generated from protobuf field <code>int32 level = 5;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setLevel($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->level = $var;
+
+        return $this;
+    }
+
+    /**
+     * 门店
+     *
+     * Generated from protobuf field <code>int32 admin_id = 6;</code>
+     * @return int
+     */
+    public function getAdminId()
+    {
+        return $this->admin_id;
+    }
+
+    /**
+     * 门店
+     *
+     * Generated from protobuf field <code>int32 admin_id = 6;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setAdminId($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->admin_id = $var;
+
+        return $this;
+    }
+
 }
 

gen/php/Proto/Api/CityPackageAddReq.php

@@ -26,6 +26,12 @@ class CityPackageAddReq extends \Google\Protobuf\Internal\Message
      * Generated from protobuf field <code>repeated .proto.api.CityPackageEnt package_list = 2;</code>
      */
     private $package_list;
+    /**
+     * 套餐分类 1租电套餐 2车电一体 3租车套餐
+     *
+     * Generated from protobuf field <code>.proto.api.DEVICE_USE_TYPE package_category = 3;</code>
+     */
+    protected $package_category = 0;
 
     /**
      * Constructor.
@@ -37,6 +43,8 @@ class CityPackageAddReq extends \Google\Protobuf\Internal\Message
      *           门店ID 默认为当前登陆的门店ID
      *     @type array<\Proto\Api\CityPackageEnt>|\Google\Protobuf\Internal\RepeatedField $package_list
      *           套餐数组列表
+     *     @type int $package_category
+     *           套餐分类 1租电套餐 2车电一体 3租车套餐
      * }
      */
     public function __construct($data = NULL) {
@@ -96,5 +104,31 @@ class CityPackageAddReq extends \Google\Protobuf\Internal\Message
         return $this;
     }
 
+    /**
+     * 套餐分类 1租电套餐 2车电一体 3租车套餐
+     *
+     * Generated from protobuf field <code>.proto.api.DEVICE_USE_TYPE package_category = 3;</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 = 3;</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;
+    }
+
 }
 

gen/php/Proto/Api/CityPackageAddRes.php

@@ -14,6 +14,24 @@ use Google\Protobuf\Internal\GPBUtil;
  */
 class CityPackageAddRes extends \Google\Protobuf\Internal\Message
 {
+    /**
+     * 失败的数量
+     *
+     * Generated from protobuf field <code>int32 fail_count = 1;</code>
+     */
+    protected $fail_count = 0;
+    /**
+     * 成功的数量
+     *
+     * Generated from protobuf field <code>int32 success_count = 2;</code>
+     */
+    protected $success_count = 0;
+    /**
+     * 总请求添加数量
+     *
+     * Generated from protobuf field <code>int32 total_count = 3;</code>
+     */
+    protected $total_count = 0;
 
     /**
      * Constructor.
@@ -21,6 +39,12 @@ class CityPackageAddRes extends \Google\Protobuf\Internal\Message
      * @param array $data {
      *     Optional. Data for populating the Message object.
      *
+     *     @type int $fail_count
+     *           失败的数量
+     *     @type int $success_count
+     *           成功的数量
+     *     @type int $total_count
+     *           总请求添加数量
      * }
      */
     public function __construct($data = NULL) {
@@ -28,5 +52,83 @@ class CityPackageAddRes extends \Google\Protobuf\Internal\Message
         parent::__construct($data);
     }
 
+    /**
+     * 失败的数量
+     *
+     * Generated from protobuf field <code>int32 fail_count = 1;</code>
+     * @return int
+     */
+    public function getFailCount()
+    {
+        return $this->fail_count;
+    }
+
+    /**
+     * 失败的数量
+     *
+     * Generated from protobuf field <code>int32 fail_count = 1;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setFailCount($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->fail_count = $var;
+
+        return $this;
+    }
+
+    /**
+     * 成功的数量
+     *
+     * Generated from protobuf field <code>int32 success_count = 2;</code>
+     * @return int
+     */
+    public function getSuccessCount()
+    {
+        return $this->success_count;
+    }
+
+    /**
+     * 成功的数量
+     *
+     * Generated from protobuf field <code>int32 success_count = 2;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setSuccessCount($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->success_count = $var;
+
+        return $this;
+    }
+
+    /**
+     * 总请求添加数量
+     *
+     * Generated from protobuf field <code>int32 total_count = 3;</code>
+     * @return int
+     */
+    public function getTotalCount()
+    {
+        return $this->total_count;
+    }
+
+    /**
+     * 总请求添加数量
+     *
+     * Generated from protobuf field <code>int32 total_count = 3;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setTotalCount($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->total_count = $var;
+
+        return $this;
+    }
+
 }
 

gen/php/Proto/Api/CityPackageEnt.php

@@ -46,6 +46,12 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
      * Generated from protobuf field <code>.proto.api.CarModelEnt car_model_info = 5;</code>
      */
     protected $car_model_info = null;
+    /**
+     * 门店信息
+     *
+     * Generated from protobuf field <code>.proto.api.EntAdmin shop_info = 6;</code>
+     */
+    protected $shop_info = null;
 
     /**
      * Constructor.
@@ -63,6 +69,8 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
      *           电池标签信息
      *     @type \Proto\Api\CarModelEnt $car_model_info
      *           车型信息
+     *     @type \Proto\Api\EntAdmin $shop_info
+     *           门店信息
      * }
      */
     public function __construct($data = NULL) {
@@ -230,5 +238,41 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
         return $this;
     }
 
+    /**
+     * 门店信息
+     *
+     * Generated from protobuf field <code>.proto.api.EntAdmin shop_info = 6;</code>
+     * @return \Proto\Api\EntAdmin|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.EntAdmin shop_info = 6;</code>
+     * @param \Proto\Api\EntAdmin $var
+     * @return $this
+     */
+    public function setShopInfo($var)
+    {
+        GPBUtil::checkMessage($var, \Proto\Api\EntAdmin::class);
+        $this->shop_info = $var;
+
+        return $this;
+    }
+
 }
 

gen/php/Proto/Api/CloseAreaReq.php

@@ -20,6 +20,12 @@ 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.
@@ -29,6 +35,8 @@ 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) {
@@ -62,5 +70,31 @@ 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/EditPackageReq.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.EditPackageReq</code>
+ */
+class EditPackageReq extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * 套餐数据
+     *
+     * Generated from protobuf field <code>.proto.api.CityPackageEnt data = 1;</code>
+     */
+    protected $data = null;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type \Proto\Api\CityPackageEnt $data
+     *           套餐数据
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * 套餐数据
+     *
+     * Generated from protobuf field <code>.proto.api.CityPackageEnt data = 1;</code>
+     * @return \Proto\Api\CityPackageEnt|null
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    public function hasData()
+    {
+        return isset($this->data);
+    }
+
+    public function clearData()
+    {
+        unset($this->data);
+    }
+
+    /**
+     * 套餐数据
+     *
+     * Generated from protobuf field <code>.proto.api.CityPackageEnt data = 1;</code>
+     * @param \Proto\Api\CityPackageEnt $var
+     * @return $this
+     */
+    public function setData($var)
+    {
+        GPBUtil::checkMessage($var, \Proto\Api\CityPackageEnt::class);
+        $this->data = $var;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/EditPackageRes.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.EditPackageRes</code>
+ */
+class EditPackageRes 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/EntPackage.php

@@ -80,6 +80,30 @@ class EntPackage extends \Google\Protobuf\Internal\Message
      * Generated from protobuf field <code>string code = 11;</code>
      */
     protected $code = '';
+    /**
+     * 库存
+     *
+     * Generated from protobuf field <code>int32 stock = 12;</code>
+     */
+    protected $stock = 0;
+    /**
+     * 创建时间 时间戳 秒
+     *
+     * Generated from protobuf field <code>int32 ctime = 13;</code>
+     */
+    protected $ctime = 0;
+    /**
+     * 更新时间 时间戳 秒
+     *
+     * Generated from protobuf field <code>int32 utime = 14;</code>
+     */
+    protected $utime = 0;
+    /**
+     * 删除时间 时间戳 秒
+     *
+     * Generated from protobuf field <code>int32 dtime = 15;</code>
+     */
+    protected $dtime = 0;
 
     /**
      * Constructor.
@@ -109,6 +133,14 @@ class EntPackage extends \Google\Protobuf\Internal\Message
      *           上下架状态
      *     @type string $code
      *           套餐code
+     *     @type int $stock
+     *           库存
+     *     @type int $ctime
+     *           创建时间 时间戳 秒
+     *     @type int $utime
+     *           更新时间 时间戳 秒
+     *     @type int $dtime
+     *           删除时间 时间戳 秒
      * }
      */
     public function __construct($data = NULL) {
@@ -402,5 +434,109 @@ class EntPackage extends \Google\Protobuf\Internal\Message
         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;
+    }
+
+    /**
+     * 创建时间 时间戳 秒
+     *
+     * Generated from protobuf field <code>int32 ctime = 13;</code>
+     * @return int
+     */
+    public function getCtime()
+    {
+        return $this->ctime;
+    }
+
+    /**
+     * 创建时间 时间戳 秒
+     *
+     * Generated from protobuf field <code>int32 ctime = 13;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setCtime($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->ctime = $var;
+
+        return $this;
+    }
+
+    /**
+     * 更新时间 时间戳 秒
+     *
+     * Generated from protobuf field <code>int32 utime = 14;</code>
+     * @return int
+     */
+    public function getUtime()
+    {
+        return $this->utime;
+    }
+
+    /**
+     * 更新时间 时间戳 秒
+     *
+     * Generated from protobuf field <code>int32 utime = 14;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setUtime($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->utime = $var;
+
+        return $this;
+    }
+
+    /**
+     * 删除时间 时间戳 秒
+     *
+     * Generated from protobuf field <code>int32 dtime = 15;</code>
+     * @return int
+     */
+    public function getDtime()
+    {
+        return $this->dtime;
+    }
+
+    /**
+     * 删除时间 时间戳 秒
+     *
+     * Generated from protobuf field <code>int32 dtime = 15;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setDtime($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->dtime = $var;
+
+        return $this;
+    }
+
 }
 

gen/php/Proto/Api/ListPackageReq.php

@@ -32,6 +32,12 @@ class ListPackageReq extends \Google\Protobuf\Internal\Message
      * Generated from protobuf field <code>.proto.api.DEVICE_USE_TYPE package_category = 3;</code>
      */
     protected $package_category = 0;
+    /**
+     * 上下架状态
+     *
+     * Generated from protobuf field <code>.proto.api.LISTED_STATUS listed_status = 4;</code>
+     */
+    protected $listed_status = 0;
 
     /**
      * Constructor.
@@ -45,6 +51,8 @@ class ListPackageReq extends \Google\Protobuf\Internal\Message
      *           门店筛选参数
      *     @type int $package_category
      *           套餐分类
+     *     @type int $listed_status
+     *           上下架状态
      * }
      */
     public function __construct($data = NULL) {
@@ -150,5 +158,31 @@ class ListPackageReq extends \Google\Protobuf\Internal\Message
         return $this;
     }
 
+    /**
+     * 上下架状态
+     *
+     * Generated from protobuf field <code>.proto.api.LISTED_STATUS listed_status = 4;</code>
+     * @return int
+     */
+    public function getListedStatus()
+    {
+        return $this->listed_status;
+    }
+
+    /**
+     * 上下架状态
+     *
+     * Generated from protobuf field <code>.proto.api.LISTED_STATUS listed_status = 4;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setListedStatus($var)
+    {
+        GPBUtil::checkEnum($var, \Proto\Api\LISTED_STATUS::class);
+        $this->listed_status = $var;
+
+        return $this;
+    }
+
 }
 

gen/php/Proto/Api/OpenAreaReq.php

@@ -20,6 +20,12 @@ class OpenAreaReq 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.
@@ -29,6 +35,8 @@ class OpenAreaReq 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) {
@@ -62,5 +70,31 @@ class OpenAreaReq 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/PackageAreaEnt.php

@@ -28,6 +28,24 @@ 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.
@@ -39,6 +57,12 @@ 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) {
@@ -108,5 +132,83 @@ 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/swagger/api/CityPackage.swagger.json

@@ -17,6 +17,46 @@
     "application/json"
   ],
   "paths": {
+    "/cityPackage/area/all-area-level-list": {
+      "post": {
+        "summary": "层级关系的所有地区列表",
+        "operationId": "CityPackageService_AllAreaLevelList",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/apiAllAreaLevelListRes"
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "$ref": "#/definitions/rpcStatus"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/apiAllAreaLevelListReq"
+            }
+          },
+          {
+            "name": "r",
+            "description": "接口地址",
+            "in": "query",
+            "required": true,
+            "example": "cityPackage/area/all-area-level-list"
+          }
+        ],
+        "tags": [
+          "API接口/后台/城市套餐"
+        ]
+      }
+    },
     "/cityPackage/area/area-list": {
       "post": {
         "summary": "地区列表",
@@ -337,6 +377,46 @@
         ]
       }
     },
+    "/cityPackage/city-package/edit-package": {
+      "post": {
+        "summary": "编辑套餐",
+        "operationId": "CityPackageService_EditPackage",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/apiEditPackageRes"
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "$ref": "#/definitions/rpcStatus"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/apiEditPackageReq"
+            }
+          },
+          {
+            "name": "r",
+            "description": "接口地址",
+            "in": "query",
+            "required": true,
+            "example": "cityPackage/city-package/edit-package"
+          }
+        ],
+        "tags": [
+          "API接口/后台/城市套餐"
+        ]
+      }
+    },
     "/cityPackage/city-package/list-package": {
       "post": {
         "summary": "套餐列表",
@@ -525,6 +605,18 @@
         }
       }
     },
+    "apiAllAreaLevelListReq": {
+      "type": "object"
+    },
+    "apiAllAreaLevelListRes": {
+      "type": "object",
+      "properties": {
+        "list": {
+          "$ref": "#/definitions/apiAreaLevelEnt",
+          "title": "省列表"
+        }
+      }
+    },
     "apiAreaEnt": {
       "type": "object",
       "properties": {
@@ -558,6 +650,23 @@
         }
       }
     },
+    "apiAreaLevelEnt": {
+      "type": "object",
+      "properties": {
+        "area_info": {
+          "$ref": "#/definitions/apiAreaEnt",
+          "title": "区域信息"
+        },
+        "children": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "$ref": "#/definitions/apiAreaLevelEnt"
+          },
+          "title": "子级区域"
+        }
+      }
+    },
     "apiAreaListReq": {
       "type": "object",
       "properties": {
@@ -568,6 +677,25 @@
         "package_area_arg": {
           "$ref": "#/definitions/apiPackageAreaEnt",
           "title": "筛选参数"
+        },
+        "is_child_query": {
+          "type": "boolean",
+          "title": "子门店查询 默认false"
+        },
+        "min_level": {
+          "type": "integer",
+          "format": "int32",
+          "title": "最小层级 1省级  2市级  3县级"
+        },
+        "level": {
+          "type": "integer",
+          "format": "int32",
+          "title": "查询的层级"
+        },
+        "admin_id": {
+          "type": "integer",
+          "format": "int32",
+          "title": "门店"
         }
       }
     },
@@ -709,11 +837,32 @@
             "$ref": "#/definitions/apiCityPackageEnt"
           },
           "title": "套餐数组列表"
+        },
+        "package_category": {
+          "$ref": "#/definitions/apiDEVICE_USE_TYPE",
+          "title": "套餐分类 1租电套餐 2车电一体 3租车套餐"
         }
       }
     },
     "apiCityPackageAddRes": {
-      "type": "object"
+      "type": "object",
+      "properties": {
+        "fail_count": {
+          "type": "integer",
+          "format": "int32",
+          "title": "失败的数量"
+        },
+        "success_count": {
+          "type": "integer",
+          "format": "int32",
+          "title": "成功的数量"
+        },
+        "total_count": {
+          "type": "integer",
+          "format": "int32",
+          "title": "总请求添加数量"
+        }
+      }
     },
     "apiCityPackageCarModelEnt": {
       "type": "object",
@@ -754,6 +903,10 @@
         "car_model_info": {
           "$ref": "#/definitions/apiCarModelEnt",
           "title": "车型信息"
+        },
+        "shop_info": {
+          "$ref": "#/definitions/apiEntAdmin",
+          "title": "门店信息"
         }
       },
       "title": "城市套餐的信息"
@@ -795,6 +948,10 @@
             "type": "string"
           },
           "title": "地区CODE列表"
+        },
+        "is_child_opt": {
+          "type": "boolean",
+          "title": "是否子门店操作关闭 默认false"
         }
       }
     },
@@ -834,6 +991,18 @@
       },
       "title": "数据的创建时间、更新时间、删除时间"
     },
+    "apiEditPackageReq": {
+      "type": "object",
+      "properties": {
+        "data": {
+          "$ref": "#/definitions/apiCityPackageEnt",
+          "title": "套餐数据"
+        }
+      }
+    },
+    "apiEditPackageRes": {
+      "type": "object"
+    },
     "apiEntAdmin": {
       "type": "object",
       "properties": {
@@ -932,6 +1101,26 @@
         "code": {
           "type": "string",
           "title": "套餐code"
+        },
+        "stock": {
+          "type": "integer",
+          "format": "int32",
+          "title": "库存"
+        },
+        "ctime": {
+          "type": "integer",
+          "format": "int32",
+          "title": "创建时间 时间戳 秒"
+        },
+        "utime": {
+          "type": "integer",
+          "format": "int32",
+          "title": "更新时间 时间戳 秒"
+        },
+        "dtime": {
+          "type": "integer",
+          "format": "int32",
+          "title": "删除时间 时间戳 秒"
         }
       }
     },
@@ -986,6 +1175,10 @@
         "package_category": {
           "$ref": "#/definitions/apiDEVICE_USE_TYPE",
           "title": "套餐分类"
+        },
+        "listed_status": {
+          "$ref": "#/definitions/apiLISTED_STATUS",
+          "title": "上下架状态"
         }
       }
     },
@@ -1016,6 +1209,10 @@
             "type": "string"
           },
           "title": "地区CODE列表"
+        },
+        "is_child_opt": {
+          "type": "boolean",
+          "title": "是否子门店操作开通 默认false"
         }
       }
     },
@@ -1093,6 +1290,22 @@
         "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": "套餐开通的地区"

gen/swagger/api/CityPackageMicroSoft.swagger.json

@@ -280,6 +280,10 @@
         "car_model_info": {
           "$ref": "#/definitions/apiCarModelEnt",
           "title": "车型信息"
+        },
+        "shop_info": {
+          "$ref": "#/definitions/apiEntAdmin",
+          "title": "门店信息"
         }
       },
       "title": "城市套餐的信息"
@@ -452,6 +456,26 @@
         "code": {
           "type": "string",
           "title": "套餐code"
+        },
+        "stock": {
+          "type": "integer",
+          "format": "int32",
+          "title": "库存"
+        },
+        "ctime": {
+          "type": "integer",
+          "format": "int32",
+          "title": "创建时间 时间戳 秒"
+        },
+        "utime": {
+          "type": "integer",
+          "format": "int32",
+          "title": "更新时间 时间戳 秒"
+        },
+        "dtime": {
+          "type": "integer",
+          "format": "int32",
+          "title": "删除时间 时间戳 秒"
         }
       }
     },