1

api/CityPackageMicroSoft.proto

@@ -28,6 +28,14 @@ service CityPackageMicroSoftService {
     };
   };
 
+  // 套餐详情
+  rpc DetailPackageMicroSoft(DetailPackageMicroSoftReq) returns (DetailPackageMicroSoftRes) {
+    option (google.api.http) = {
+        post : "/cityexchange/city-package/detail-package",
+        body : "*",
+    };
+  };
+
   
   // --------------------------------订单-------------------------------------------
 
@@ -38,6 +46,14 @@ service CityPackageMicroSoftService {
         body : "*",
     };
   }
+
+  // 预约购买套餐
+  rpc PreBuyMicroSoft(PreBuyMicroSoftReq) returns (PreBuyMicroSoftRes) {
+    option (google.api.http) = {
+        post : "/cityexchange/order/pre-buy",
+        body : "*",
+    };
+  }
 }
 
 
@@ -62,4 +78,17 @@ message OrderListMicroSoftRes {
   int32 total = 1;
   // 订单数据数组
   repeated CityPackageOrderEnt list = 2;
+}
+
+message DetailPackageMicroSoftReq {
+  repeated string package_code = 1;
+}
+message DetailPackageMicroSoftRes {
+  CityPackageOrderEnt data = 1;
+}
+
+message PreBuyMicroSoftReq{
+  CityPackageOrderEnt data = 1;
+}
+message PreBuyMicroSoftRes {
 }

api/Common.proto

@@ -58,4 +58,20 @@ message DataTime {
     int32 utime = 2;
     // 删除时间 时间戳 秒
     int32 dtime = 3;
+}
+
+// 支付方式
+enum PAY_METHOD {
+  // 保留
+  PAY_METHOD_RESERVED = 0;
+  // 微信 jsapi
+  PAY_METHOD_WECHAT = 1;
+}
+
+// 请求来源
+enum REQUEST_SOURCE {
+  // 保留
+  REQUEST_SOURCE_RESERVED = 0;
+  // 微信小程序
+  REQUEST_SOURCE_WECHAT = 1;
 }

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/EntCarModel.proto";
 
 option go_package = "api/v1";
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
@@ -29,20 +30,24 @@ message CityPackageTagEnt{
 message CityPackageOrderEnt {
   // 基本订单信息
   EntOrder order_info = 1;
+  // 保险信息
+  string insurance_info = 2;
+  // 城市套餐信息
+  CityPackageEnt city_package_info = 3;
 }
 
 // 城市套餐的信息
 message CityPackageEnt {
-  // 标签编号 单电，单车套餐类型时的对象标签，车电一体式为电池标签
-  string tag_code = 1;
-  // 车电一体时的车辆标签
-  string relation_tag_code = 2;
   // 套餐信息
-  EntPackage package_info = 3;
+  EntPackage package_info = 1;
   // 套餐分类 1租电套餐 2车电一体 3租车套餐
-  DEVICE_USE_TYPE package_category = 4;
+  DEVICE_USE_TYPE package_category = 2;
   // 支持的区县ID列表
-  repeated AreaEnt area_list = 5;
+  repeated AreaEnt area_list = 3;
+  // 电池标签信息
+  EntTag battery_tag_info = 4;
+  // 车型信息
+  CarModelEnt car_model_info = 5;
 }
 
 // 套餐开通的地区

api/EntOrder.proto

@@ -68,4 +68,8 @@ message EntOrder {
     EntAdmin shop_info = 4;
     // 订单时间
     OrderTime order_time = 5;
+    // 支付方式
+    PAY_METHOD pay_method = 6;
+    // 订单来源
+    REQUEST_SOURCE order_source = 7;
 }

api/EntPackage.proto

@@ -12,7 +12,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   host : ""
 };
 
-enum PackageType{
+enum PackageType {
   // 保留
   PACKAGE_TYPE_RESERVED = 0;
   // 天卡
@@ -26,7 +26,7 @@ enum PackageType{
 message EntPackage {
   // 套餐名称
   string name = 1;
-  // 套餐类型：1天卡，2次数卡（暂不支持），3天次卡
+  // 套餐类型
   PackageType type = 2;
   // 押金
   int32 pledge = 3; 
@@ -44,4 +44,6 @@ message EntPackage {
   int32 buy_limit = 9;
   // 上下架状态
   LISTED_STATUS listed_status = 10;
+  // 套餐code
+  string code = 11;
 }

gen/php/GPBMetadata/Api/Common.php

@@ -16,7 +16,7 @@ class Common
           return;
         }
         $pool->internalAddGeneratedFile(
-            "\x0A\x90\x04\x0A\x10api/Common.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\"L\x0A\x07PageArg\x12\x0C\x0A\x04page\x18\x01 \x01(\x05\x12\x0D\x0A\x05limit\x18\x02 \x01(\x05\x12\x10\x0A\x08order_by\x18\x03 \x01(\x09\x12\x12\x0A\x0Aorder_type\x18\x04 \x01(\x09\"0\x0A\x07ShopArg\x12\x0F\x0A\x07shop_id\x18\x01 \x01(\x05\x12\x14\x0A\x0Cis_all_level\x18\x02 \x01(\x08\"7\x0A\x08DataTime\x12\x0D\x0A\x05ctime\x18\x01 \x01(\x05\x12\x0D\x0A\x05utime\x18\x02 \x01(\x05\x12\x0D\x0A\x05dtime\x18\x03 \x01(\x05*a\x0A\x0DLISTED_STATUS\x12\x1A\x0A\x16LISTED_STATUS_RESERVED\x10\x00\x12\x18\x0A\x14LISTED_STATUS_LISTED\x10\x01\x12\x1A\x0A\x16LISTED_STATUS_UNLISTED\x10\x02*\xA0\x01\x0A\x0FDEVICE_USE_TYPE\x12\x1C\x0A\x18DEVICE_USE_TYPE_RESERVED\x10\x00\x12\x1B\x0A\x17DEVICE_USE_TYPE_BATTERY\x10\x01\x12\$\x0A DEVICE_USE_TYPE_ELECTRIC_VEHICLE\x10\x02\x12,\x0A(DEVICE_USE_TYPE_ELECTRIC_VEHICLE_BATTERY\x10\x03B\x08Z\x06api/v1b\x06proto3"
+            "\x0A\x98\x05\x0A\x10api/Common.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\"L\x0A\x07PageArg\x12\x0C\x0A\x04page\x18\x01 \x01(\x05\x12\x0D\x0A\x05limit\x18\x02 \x01(\x05\x12\x10\x0A\x08order_by\x18\x03 \x01(\x09\x12\x12\x0A\x0Aorder_type\x18\x04 \x01(\x09\"0\x0A\x07ShopArg\x12\x0F\x0A\x07shop_id\x18\x01 \x01(\x05\x12\x14\x0A\x0Cis_all_level\x18\x02 \x01(\x08\"7\x0A\x08DataTime\x12\x0D\x0A\x05ctime\x18\x01 \x01(\x05\x12\x0D\x0A\x05utime\x18\x02 \x01(\x05\x12\x0D\x0A\x05dtime\x18\x03 \x01(\x05*a\x0A\x0DLISTED_STATUS\x12\x1A\x0A\x16LISTED_STATUS_RESERVED\x10\x00\x12\x18\x0A\x14LISTED_STATUS_LISTED\x10\x01\x12\x1A\x0A\x16LISTED_STATUS_UNLISTED\x10\x02*\xA0\x01\x0A\x0FDEVICE_USE_TYPE\x12\x1C\x0A\x18DEVICE_USE_TYPE_RESERVED\x10\x00\x12\x1B\x0A\x17DEVICE_USE_TYPE_BATTERY\x10\x01\x12\$\x0A DEVICE_USE_TYPE_ELECTRIC_VEHICLE\x10\x02\x12,\x0A(DEVICE_USE_TYPE_ELECTRIC_VEHICLE_BATTERY\x10\x03*<\x0A\x0APAY_METHOD\x12\x17\x0A\x13PAY_METHOD_RESERVED\x10\x00\x12\x15\x0A\x11PAY_METHOD_WECHAT\x10\x01*H\x0A\x0EREQUEST_SOURCE\x12\x1B\x0A\x17REQUEST_SOURCE_RESERVED\x10\x00\x12\x19\x0A\x15REQUEST_SOURCE_WECHAT\x10\x01B\x08Z\x06api/v1b\x06proto3"
         , true);
 
         static::$is_initialized = true;

gen/php/GPBMetadata/Api/EntCityPackage.php

@@ -22,8 +22,9 @@ class EntCityPackage
         \GPBMetadata\Api\EntOrder::initOnce();
         \GPBMetadata\Api\EntTag::initOnce();
         \GPBMetadata\Api\EntCommon::initOnce();
+        \GPBMetadata\Api\EntCarModel::initOnce();
         $pool->internalAddGeneratedFile(
-            "\x0A\x9A\x05\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\"8\x0A\x11CityPackageTagEnt\x12#\x0A\x08tag_info\x18\x01 \x01(\x0B2\x11.proto.api.EntTag\">\x0A\x13CityPackageOrderEnt\x12'\x0A\x0Aorder_info\x18\x01 \x01(\x0B2\x13.proto.api.EntOrder\"\xC7\x01\x0A\x0ECityPackageEnt\x12\x10\x0A\x08tag_code\x18\x01 \x01(\x09\x12\x19\x0A\x11relation_tag_code\x18\x02 \x01(\x09\x12+\x0A\x0Cpackage_info\x18\x03 \x01(\x0B2\x15.proto.api.EntPackage\x124\x0A\x10package_category\x18\x04 \x01(\x0E2\x1A.proto.api.DEVICE_USE_TYPE\x12%\x0A\x09area_list\x18\x05 \x03(\x0B2\x12.proto.api.AreaEnt\"_\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\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"
         , 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\xC1\x06\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\"\xA7\x01\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*\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\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"
         , 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\xEF\x03\x0A\x14api/EntPackage.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\x1A\x10api/Common.proto\"\xF5\x01\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*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\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"
         , true);
 
         static::$is_initialized = true;

gen/php/Proto/Api/CityPackageEnt.php

@@ -16,36 +16,36 @@ use Google\Protobuf\Internal\GPBUtil;
  */
 class CityPackageEnt extends \Google\Protobuf\Internal\Message
 {
-    /**
-     * 标签编号 单电，单车套餐类型时的对象标签，车电一体式为电池标签
-     *
-     * Generated from protobuf field <code>string tag_code = 1;</code>
-     */
-    protected $tag_code = '';
-    /**
-     * 车电一体时的车辆标签
-     *
-     * Generated from protobuf field <code>string relation_tag_code = 2;</code>
-     */
-    protected $relation_tag_code = '';
     /**
      * 套餐信息
      *
-     * Generated from protobuf field <code>.proto.api.EntPackage package_info = 3;</code>
+     * Generated from protobuf field <code>.proto.api.EntPackage package_info = 1;</code>
      */
     protected $package_info = null;
     /**
      * 套餐分类 1租电套餐 2车电一体 3租车套餐
      *
-     * Generated from protobuf field <code>.proto.api.DEVICE_USE_TYPE package_category = 4;</code>
+     * Generated from protobuf field <code>.proto.api.DEVICE_USE_TYPE package_category = 2;</code>
      */
     protected $package_category = 0;
     /**
      * 支持的区县ID列表
      *
-     * Generated from protobuf field <code>repeated .proto.api.AreaEnt area_list = 5;</code>
+     * Generated from protobuf field <code>repeated .proto.api.AreaEnt area_list = 3;</code>
      */
     private $area_list;
+    /**
+     * 电池标签信息
+     *
+     * Generated from protobuf field <code>.proto.api.EntTag battery_tag_info = 4;</code>
+     */
+    protected $battery_tag_info = null;
+    /**
+     * 车型信息
+     *
+     * Generated from protobuf field <code>.proto.api.CarModelEnt car_model_info = 5;</code>
+     */
+    protected $car_model_info = null;
 
     /**
      * Constructor.
@@ -53,16 +53,16 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
      * @param array $data {
      *     Optional. Data for populating the Message object.
      *
-     *     @type string $tag_code
-     *           标签编号 单电，单车套餐类型时的对象标签，车电一体式为电池标签
-     *     @type string $relation_tag_code
-     *           车电一体时的车辆标签
      *     @type \Proto\Api\EntPackage $package_info
      *           套餐信息
      *     @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) {
@@ -70,62 +70,10 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
         parent::__construct($data);
     }
 
-    /**
-     * 标签编号 单电，单车套餐类型时的对象标签，车电一体式为电池标签
-     *
-     * Generated from protobuf field <code>string tag_code = 1;</code>
-     * @return string
-     */
-    public function getTagCode()
-    {
-        return $this->tag_code;
-    }
-
-    /**
-     * 标签编号 单电，单车套餐类型时的对象标签，车电一体式为电池标签
-     *
-     * Generated from protobuf field <code>string tag_code = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setTagCode($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->tag_code = $var;
-
-        return $this;
-    }
-
-    /**
-     * 车电一体时的车辆标签
-     *
-     * Generated from protobuf field <code>string relation_tag_code = 2;</code>
-     * @return string
-     */
-    public function getRelationTagCode()
-    {
-        return $this->relation_tag_code;
-    }
-
-    /**
-     * 车电一体时的车辆标签
-     *
-     * Generated from protobuf field <code>string relation_tag_code = 2;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setRelationTagCode($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->relation_tag_code = $var;
-
-        return $this;
-    }
-
     /**
      * 套餐信息
      *
-     * Generated from protobuf field <code>.proto.api.EntPackage package_info = 3;</code>
+     * Generated from protobuf field <code>.proto.api.EntPackage package_info = 1;</code>
      * @return \Proto\Api\EntPackage|null
      */
     public function getPackageInfo()
@@ -146,7 +94,7 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
     /**
      * 套餐信息
      *
-     * Generated from protobuf field <code>.proto.api.EntPackage package_info = 3;</code>
+     * Generated from protobuf field <code>.proto.api.EntPackage package_info = 1;</code>
      * @param \Proto\Api\EntPackage $var
      * @return $this
      */
@@ -161,7 +109,7 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
     /**
      * 套餐分类 1租电套餐 2车电一体 3租车套餐
      *
-     * Generated from protobuf field <code>.proto.api.DEVICE_USE_TYPE package_category = 4;</code>
+     * Generated from protobuf field <code>.proto.api.DEVICE_USE_TYPE package_category = 2;</code>
      * @return int
      */
     public function getPackageCategory()
@@ -172,7 +120,7 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
     /**
      * 套餐分类 1租电套餐 2车电一体 3租车套餐
      *
-     * Generated from protobuf field <code>.proto.api.DEVICE_USE_TYPE package_category = 4;</code>
+     * Generated from protobuf field <code>.proto.api.DEVICE_USE_TYPE package_category = 2;</code>
      * @param int $var
      * @return $this
      */
@@ -187,7 +135,7 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
     /**
      * 支持的区县ID列表
      *
-     * Generated from protobuf field <code>repeated .proto.api.AreaEnt area_list = 5;</code>
+     * Generated from protobuf field <code>repeated .proto.api.AreaEnt area_list = 3;</code>
      * @return \Google\Protobuf\Internal\RepeatedField
      */
     public function getAreaList()
@@ -198,7 +146,7 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
     /**
      * 支持的区县ID列表
      *
-     * Generated from protobuf field <code>repeated .proto.api.AreaEnt area_list = 5;</code>
+     * Generated from protobuf field <code>repeated .proto.api.AreaEnt area_list = 3;</code>
      * @param array<\Proto\Api\AreaEnt>|\Google\Protobuf\Internal\RepeatedField $var
      * @return $this
      */
@@ -210,5 +158,77 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
         return $this;
     }
 
+    /**
+     * 电池标签信息
+     *
+     * Generated from protobuf field <code>.proto.api.EntTag battery_tag_info = 4;</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 = 4;</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 = 5;</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 = 5;</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/CityPackageOrderEnt.php

@@ -22,6 +22,18 @@ class CityPackageOrderEnt extends \Google\Protobuf\Internal\Message
      * Generated from protobuf field <code>.proto.api.EntOrder order_info = 1;</code>
      */
     protected $order_info = null;
+    /**
+     * 保险信息
+     *
+     * Generated from protobuf field <code>string insurance_info = 2;</code>
+     */
+    protected $insurance_info = '';
+    /**
+     * 城市套餐信息
+     *
+     * Generated from protobuf field <code>.proto.api.CityPackageEnt city_package_info = 3;</code>
+     */
+    protected $city_package_info = null;
 
     /**
      * Constructor.
@@ -31,6 +43,10 @@ class CityPackageOrderEnt extends \Google\Protobuf\Internal\Message
      *
      *     @type \Proto\Api\EntOrder $order_info
      *           基本订单信息
+     *     @type string $insurance_info
+     *           保险信息
+     *     @type \Proto\Api\CityPackageEnt $city_package_info
+     *           城市套餐信息
      * }
      */
     public function __construct($data = NULL) {
@@ -74,5 +90,67 @@ class CityPackageOrderEnt extends \Google\Protobuf\Internal\Message
         return $this;
     }
 
+    /**
+     * 保险信息
+     *
+     * Generated from protobuf field <code>string insurance_info = 2;</code>
+     * @return string
+     */
+    public function getInsuranceInfo()
+    {
+        return $this->insurance_info;
+    }
+
+    /**
+     * 保险信息
+     *
+     * Generated from protobuf field <code>string insurance_info = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setInsuranceInfo($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->insurance_info = $var;
+
+        return $this;
+    }
+
+    /**
+     * 城市套餐信息
+     *
+     * Generated from protobuf field <code>.proto.api.CityPackageEnt city_package_info = 3;</code>
+     * @return \Proto\Api\CityPackageEnt|null
+     */
+    public function getCityPackageInfo()
+    {
+        return $this->city_package_info;
+    }
+
+    public function hasCityPackageInfo()
+    {
+        return isset($this->city_package_info);
+    }
+
+    public function clearCityPackageInfo()
+    {
+        unset($this->city_package_info);
+    }
+
+    /**
+     * 城市套餐信息
+     *
+     * Generated from protobuf field <code>.proto.api.CityPackageEnt city_package_info = 3;</code>
+     * @param \Proto\Api\CityPackageEnt $var
+     * @return $this
+     */
+    public function setCityPackageInfo($var)
+    {
+        GPBUtil::checkMessage($var, \Proto\Api\CityPackageEnt::class);
+        $this->city_package_info = $var;
+
+        return $this;
+    }
+
 }
 

gen/php/Proto/Api/DetailPackageMicroSoftReq.php

@@ -0,0 +1,59 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackageMicroSoft.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.DetailPackageMicroSoftReq</code>
+ */
+class DetailPackageMicroSoftReq extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * Generated from protobuf field <code>repeated string package_code = 1;</code>
+     */
+    private $package_code;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type array<string>|\Google\Protobuf\Internal\RepeatedField $package_code
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackageMicroSoft::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * Generated from protobuf field <code>repeated string package_code = 1;</code>
+     * @return \Google\Protobuf\Internal\RepeatedField
+     */
+    public function getPackageCode()
+    {
+        return $this->package_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;
+    }
+
+}
+

gen/php/Proto/Api/DetailPackageMicroSoftRes.php

@@ -0,0 +1,69 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackageMicroSoft.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.DetailPackageMicroSoftRes</code>
+ */
+class DetailPackageMicroSoftRes extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * Generated from protobuf field <code>.proto.api.CityPackageOrderEnt data = 1;</code>
+     */
+    protected $data = null;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type \Proto\Api\CityPackageOrderEnt $data
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackageMicroSoft::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * Generated from protobuf field <code>.proto.api.CityPackageOrderEnt data = 1;</code>
+     * @return \Proto\Api\CityPackageOrderEnt|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.CityPackageOrderEnt data = 1;</code>
+     * @param \Proto\Api\CityPackageOrderEnt $var
+     * @return $this
+     */
+    public function setData($var)
+    {
+        GPBUtil::checkMessage($var, \Proto\Api\CityPackageOrderEnt::class);
+        $this->data = $var;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/EntOrder.php

@@ -46,6 +46,18 @@ class EntOrder extends \Google\Protobuf\Internal\Message
      * Generated from protobuf field <code>.proto.api.OrderTime order_time = 5;</code>
      */
     protected $order_time = null;
+    /**
+     * 支付方式
+     *
+     * Generated from protobuf field <code>.proto.api.PAY_METHOD pay_method = 6;</code>
+     */
+    protected $pay_method = 0;
+    /**
+     * 订单来源
+     *
+     * Generated from protobuf field <code>.proto.api.REQUEST_SOURCE order_source = 7;</code>
+     */
+    protected $order_source = 0;
 
     /**
      * Constructor.
@@ -63,6 +75,10 @@ class EntOrder extends \Google\Protobuf\Internal\Message
      *           门店信息
      *     @type \Proto\Api\OrderTime $order_time
      *           订单时间
+     *     @type int $pay_method
+     *           支付方式
+     *     @type int $order_source
+     *           订单来源
      * }
      */
     public function __construct($data = NULL) {
@@ -230,5 +246,57 @@ class EntOrder extends \Google\Protobuf\Internal\Message
         return $this;
     }
 
+    /**
+     * 支付方式
+     *
+     * Generated from protobuf field <code>.proto.api.PAY_METHOD pay_method = 6;</code>
+     * @return int
+     */
+    public function getPayMethod()
+    {
+        return $this->pay_method;
+    }
+
+    /**
+     * 支付方式
+     *
+     * Generated from protobuf field <code>.proto.api.PAY_METHOD pay_method = 6;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setPayMethod($var)
+    {
+        GPBUtil::checkEnum($var, \Proto\Api\PAY_METHOD::class);
+        $this->pay_method = $var;
+
+        return $this;
+    }
+
+    /**
+     * 订单来源
+     *
+     * Generated from protobuf field <code>.proto.api.REQUEST_SOURCE order_source = 7;</code>
+     * @return int
+     */
+    public function getOrderSource()
+    {
+        return $this->order_source;
+    }
+
+    /**
+     * 订单来源
+     *
+     * Generated from protobuf field <code>.proto.api.REQUEST_SOURCE order_source = 7;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setOrderSource($var)
+    {
+        GPBUtil::checkEnum($var, \Proto\Api\REQUEST_SOURCE::class);
+        $this->order_source = $var;
+
+        return $this;
+    }
+
 }
 

gen/php/Proto/Api/EntPackage.php

@@ -21,7 +21,7 @@ class EntPackage extends \Google\Protobuf\Internal\Message
      */
     protected $name = '';
     /**
-     * 套餐类型：1天卡，2次数卡（暂不支持），3天次卡
+     * 套餐类型
      *
      * Generated from protobuf field <code>.proto.api.PackageType type = 2;</code>
      */
@@ -74,6 +74,12 @@ class EntPackage extends \Google\Protobuf\Internal\Message
      * Generated from protobuf field <code>.proto.api.LISTED_STATUS listed_status = 10;</code>
      */
     protected $listed_status = 0;
+    /**
+     * 套餐code
+     *
+     * Generated from protobuf field <code>string code = 11;</code>
+     */
+    protected $code = '';
 
     /**
      * Constructor.
@@ -84,7 +90,7 @@ class EntPackage extends \Google\Protobuf\Internal\Message
      *     @type string $name
      *           套餐名称
      *     @type int $type
-     *           套餐类型：1天卡，2次数卡（暂不支持），3天次卡
+     *           套餐类型
      *     @type int $pledge
      *           押金
      *     @type int $total_day
@@ -101,6 +107,8 @@ class EntPackage extends \Google\Protobuf\Internal\Message
      *           购买限制数量
      *     @type int $listed_status
      *           上下架状态
+     *     @type string $code
+     *           套餐code
      * }
      */
     public function __construct($data = NULL) {
@@ -135,7 +143,7 @@ class EntPackage extends \Google\Protobuf\Internal\Message
     }
 
     /**
-     * 套餐类型：1天卡，2次数卡（暂不支持），3天次卡
+     * 套餐类型
      *
      * Generated from protobuf field <code>.proto.api.PackageType type = 2;</code>
      * @return int
@@ -146,7 +154,7 @@ class EntPackage extends \Google\Protobuf\Internal\Message
     }
 
     /**
-     * 套餐类型：1天卡，2次数卡（暂不支持），3天次卡
+     * 套餐类型
      *
      * Generated from protobuf field <code>.proto.api.PackageType type = 2;</code>
      * @param int $var
@@ -368,5 +376,31 @@ class EntPackage extends \Google\Protobuf\Internal\Message
         return $this;
     }
 
+    /**
+     * 套餐code
+     *
+     * Generated from protobuf field <code>string code = 11;</code>
+     * @return string
+     */
+    public function getCode()
+    {
+        return $this->code;
+    }
+
+    /**
+     * 套餐code
+     *
+     * Generated from protobuf field <code>string code = 11;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setCode($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->code = $var;
+
+        return $this;
+    }
+
 }
 

gen/php/Proto/Api/PAY_METHOD.php

@@ -0,0 +1,55 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/Common.proto
+
+namespace Proto\Api;
+
+use UnexpectedValueException;
+
+/**
+ * 支付方式
+ *
+ * Protobuf type <code>proto.api.PAY_METHOD</code>
+ */
+class PAY_METHOD
+{
+    /**
+     * 保留
+     *
+     * Generated from protobuf enum <code>PAY_METHOD_RESERVED = 0;</code>
+     */
+    const PAY_METHOD_RESERVED = 0;
+    /**
+     * 微信 jsapi
+     *
+     * Generated from protobuf enum <code>PAY_METHOD_WECHAT = 1;</code>
+     */
+    const PAY_METHOD_WECHAT = 1;
+
+    private static $valueToName = [
+        self::PAY_METHOD_RESERVED => 'PAY_METHOD_RESERVED',
+        self::PAY_METHOD_WECHAT => 'PAY_METHOD_WECHAT',
+    ];
+
+    public static function name($value)
+    {
+        if (!isset(self::$valueToName[$value])) {
+            throw new UnexpectedValueException(sprintf(
+                    'Enum %s has no name defined for value %s', __CLASS__, $value));
+        }
+        return self::$valueToName[$value];
+    }
+
+
+    public static function value($name)
+    {
+        $const = __CLASS__ . '::' . strtoupper($name);
+        if (!defined($const)) {
+            throw new UnexpectedValueException(sprintf(
+                    'Enum %s has no value defined for name %s', __CLASS__, $name));
+        }
+        return constant($const);
+    }
+}
+

gen/php/Proto/Api/PreBuyMicroSoftReq.php

@@ -0,0 +1,69 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackageMicroSoft.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.PreBuyMicroSoftReq</code>
+ */
+class PreBuyMicroSoftReq extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * Generated from protobuf field <code>.proto.api.CityPackageOrderEnt data = 1;</code>
+     */
+    protected $data = null;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type \Proto\Api\CityPackageOrderEnt $data
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackageMicroSoft::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * Generated from protobuf field <code>.proto.api.CityPackageOrderEnt data = 1;</code>
+     * @return \Proto\Api\CityPackageOrderEnt|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.CityPackageOrderEnt data = 1;</code>
+     * @param \Proto\Api\CityPackageOrderEnt $var
+     * @return $this
+     */
+    public function setData($var)
+    {
+        GPBUtil::checkMessage($var, \Proto\Api\CityPackageOrderEnt::class);
+        $this->data = $var;
+
+        return $this;
+    }
+
+}
+

gen/php/Proto/Api/PreBuyMicroSoftRes.php

@@ -0,0 +1,32 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/CityPackageMicroSoft.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.PreBuyMicroSoftRes</code>
+ */
+class PreBuyMicroSoftRes extends \Google\Protobuf\Internal\Message
+{
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Api\CityPackageMicroSoft::initOnce();
+        parent::__construct($data);
+    }
+
+}
+

gen/php/Proto/Api/REQUEST_SOURCE.php

@@ -0,0 +1,55 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: api/Common.proto
+
+namespace Proto\Api;
+
+use UnexpectedValueException;
+
+/**
+ * 请求来源
+ *
+ * Protobuf type <code>proto.api.REQUEST_SOURCE</code>
+ */
+class REQUEST_SOURCE
+{
+    /**
+     * 保留
+     *
+     * Generated from protobuf enum <code>REQUEST_SOURCE_RESERVED = 0;</code>
+     */
+    const REQUEST_SOURCE_RESERVED = 0;
+    /**
+     * 微信小程序
+     *
+     * Generated from protobuf enum <code>REQUEST_SOURCE_WECHAT = 1;</code>
+     */
+    const REQUEST_SOURCE_WECHAT = 1;
+
+    private static $valueToName = [
+        self::REQUEST_SOURCE_RESERVED => 'REQUEST_SOURCE_RESERVED',
+        self::REQUEST_SOURCE_WECHAT => 'REQUEST_SOURCE_WECHAT',
+    ];
+
+    public static function name($value)
+    {
+        if (!isset(self::$valueToName[$value])) {
+            throw new UnexpectedValueException(sprintf(
+                    'Enum %s has no name defined for value %s', __CLASS__, $value));
+        }
+        return self::$valueToName[$value];
+    }
+
+
+    public static function value($name)
+    {
+        $const = __CLASS__ . '::' . strtoupper($name);
+        if (!defined($const)) {
+            throw new UnexpectedValueException(sprintf(
+                    'Enum %s has no value defined for name %s', __CLASS__, $name));
+        }
+        return constant($const);
+    }
+}
+

gen/swagger/api/CityPackage.swagger.json

@@ -17,15 +17,15 @@
     "application/json"
   ],
   "paths": {
-    "/cityPackage/area/close-area": {
+    "/cityPackage/area/area-list": {
       "post": {
-        "summary": "关闭地区",
-        "operationId": "CityPackageService_CloseArea",
+        "summary": "地区列表",
+        "operationId": "CityPackageService_AreaList",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/apiCloseAreaRes"
+              "$ref": "#/definitions/apiAreaListRes"
             }
           },
           "default": {
@@ -41,7 +41,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/apiCloseAreaReq"
+              "$ref": "#/definitions/apiAreaListReq"
             }
           },
           {
@@ -49,7 +49,7 @@
             "description": "接口地址",
             "in": "query",
             "required": true,
-            "example": "cityPackage/area/close-area"
+            "example": "cityPackage/area/area-list"
           }
         ],
         "tags": [
@@ -57,15 +57,15 @@
         ]
       }
     },
-    "/cityPackage/area/list": {
+    "/cityPackage/area/close-area": {
       "post": {
-        "summary": "地区列表",
-        "operationId": "CityPackageService_AreaList",
+        "summary": "关闭地区",
+        "operationId": "CityPackageService_CloseArea",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/apiAreaListRes"
+              "$ref": "#/definitions/apiCloseAreaRes"
             }
           },
           "default": {
@@ -81,7 +81,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/apiAreaListReq"
+              "$ref": "#/definitions/apiCloseAreaReq"
             }
           },
           {
@@ -89,7 +89,7 @@
             "description": "接口地址",
             "in": "query",
             "required": true,
-            "example": "cityPackage/area/list"
+            "example": "cityPackage/area/close-area"
           }
         ],
         "tags": [
@@ -731,14 +731,6 @@
     "apiCityPackageEnt": {
       "type": "object",
       "properties": {
-        "tag_code": {
-          "type": "string",
-          "title": "标签编号 单电，单车套餐类型时的对象标签，车电一体式为电池标签"
-        },
-        "relation_tag_code": {
-          "type": "string",
-          "title": "车电一体时的车辆标签"
-        },
         "package_info": {
           "$ref": "#/definitions/apiEntPackage",
           "title": "套餐信息"
@@ -754,6 +746,14 @@
             "$ref": "#/definitions/apiAreaEnt"
           },
           "title": "支持的区县ID列表"
+        },
+        "battery_tag_info": {
+          "$ref": "#/definitions/apiEntTag",
+          "title": "电池标签信息"
+        },
+        "car_model_info": {
+          "$ref": "#/definitions/apiCarModelEnt",
+          "title": "车型信息"
         }
       },
       "title": "城市套餐的信息"
@@ -764,6 +764,14 @@
         "order_info": {
           "$ref": "#/definitions/apiEntOrder",
           "title": "基本订单信息"
+        },
+        "insurance_info": {
+          "type": "string",
+          "title": "保险信息"
+        },
+        "city_package_info": {
+          "$ref": "#/definitions/apiCityPackageEnt",
+          "title": "城市套餐信息"
         }
       },
       "title": "城市套餐订单实体"
@@ -859,6 +867,14 @@
         "order_time": {
           "$ref": "#/definitions/apiOrderTime",
           "title": "订单时间"
+        },
+        "pay_method": {
+          "$ref": "#/definitions/apiPAY_METHOD",
+          "title": "支付方式"
+        },
+        "order_source": {
+          "$ref": "#/definitions/apiREQUEST_SOURCE",
+          "title": "订单来源"
         }
       },
       "title": "订单实体"
@@ -872,7 +888,7 @@
         },
         "type": {
           "$ref": "#/definitions/apiPackageType",
-          "title": "套餐类型：1天卡，2次数卡（暂不支持），3天次卡"
+          "title": "套餐类型"
         },
         "pledge": {
           "type": "integer",
@@ -912,6 +928,10 @@
         "listed_status": {
           "$ref": "#/definitions/apiLISTED_STATUS",
           "title": "上下架状态"
+        },
+        "code": {
+          "type": "string",
+          "title": "套餐code"
         }
       }
     },
@@ -1053,6 +1073,16 @@
       },
       "title": "订单相关的时间"
     },
+    "apiPAY_METHOD": {
+      "type": "string",
+      "enum": [
+        "PAY_METHOD_RESERVED",
+        "PAY_METHOD_WECHAT"
+      ],
+      "default": "PAY_METHOD_RESERVED",
+      "description": "- PAY_METHOD_RESERVED: 保留\n - PAY_METHOD_WECHAT: 微信 jsapi",
+      "title": "支付方式"
+    },
     "apiPackageAreaEnt": {
       "type": "object",
       "properties": {
@@ -1133,6 +1163,16 @@
       },
       "title": "PageArg 分页参数"
     },
+    "apiREQUEST_SOURCE": {
+      "type": "string",
+      "enum": [
+        "REQUEST_SOURCE_RESERVED",
+        "REQUEST_SOURCE_WECHAT"
+      ],
+      "default": "REQUEST_SOURCE_RESERVED",
+      "description": "- REQUEST_SOURCE_RESERVED: 保留\n - REQUEST_SOURCE_WECHAT: 微信小程序",
+      "title": "请求来源"
+    },
     "apiShopArg": {
       "type": "object",
       "properties": {

gen/swagger/api/CityPackageMicroSoft.swagger.json

@@ -17,6 +17,46 @@
     "application/json"
   ],
   "paths": {
+    "/cityexchange/city-package/detail-package": {
+      "post": {
+        "summary": "套餐详情",
+        "operationId": "CityPackageMicroSoftService_DetailPackageMicroSoft",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/apiDetailPackageMicroSoftRes"
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "$ref": "#/definitions/rpcStatus"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/apiDetailPackageMicroSoftReq"
+            }
+          },
+          {
+            "name": "r",
+            "description": "接口地址",
+            "in": "query",
+            "required": true,
+            "example": "cityexchange/city-package/detail-package"
+          }
+        ],
+        "tags": [
+          "API接口/小程序/城市套餐"
+        ]
+      }
+    },
     "/cityexchange/city-package/list-package": {
       "post": {
         "summary": "套餐列表",
@@ -96,6 +136,46 @@
           "API接口/小程序/城市套餐"
         ]
       }
+    },
+    "/cityexchange/order/pre-buy": {
+      "post": {
+        "summary": "预约购买套餐",
+        "operationId": "CityPackageMicroSoftService_PreBuyMicroSoft",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/apiPreBuyMicroSoftRes"
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "$ref": "#/definitions/rpcStatus"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/apiPreBuyMicroSoftReq"
+            }
+          },
+          {
+            "name": "r",
+            "description": "接口地址",
+            "in": "query",
+            "required": true,
+            "example": "cityexchange/order/pre-buy"
+          }
+        ],
+        "tags": [
+          "API接口/小程序/城市套餐"
+        ]
+      }
     }
   },
   "definitions": {
@@ -113,12 +193,111 @@
         }
       }
     },
+    "apiAreaEnt": {
+      "type": "object",
+      "properties": {
+        "province_code": {
+          "type": "string",
+          "title": "省编号"
+        },
+        "province_name": {
+          "type": "string",
+          "title": "省名称"
+        },
+        "city_code": {
+          "type": "string",
+          "title": "市编号"
+        },
+        "city_name": {
+          "type": "string",
+          "title": "市名称"
+        },
+        "area_code": {
+          "type": "string",
+          "title": "区编号"
+        },
+        "area_name": {
+          "type": "string",
+          "title": "区名称"
+        },
+        "area_id": {
+          "type": "string",
+          "title": "地区code"
+        }
+      }
+    },
+    "apiCarModelEnt": {
+      "type": "object",
+      "properties": {
+        "model_name": {
+          "type": "string",
+          "title": "车型名称"
+        },
+        "model_code": {
+          "type": "string",
+          "title": "车型编号"
+        },
+        "model_images": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "title": "车型图片"
+        },
+        "model_id": {
+          "type": "string",
+          "title": "车型ID"
+        },
+        "data_time": {
+          "$ref": "#/definitions/apiDataTime",
+          "title": "数据时间"
+        }
+      }
+    },
+    "apiCityPackageEnt": {
+      "type": "object",
+      "properties": {
+        "package_info": {
+          "$ref": "#/definitions/apiEntPackage",
+          "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": "车型信息"
+        }
+      },
+      "title": "城市套餐的信息"
+    },
     "apiCityPackageOrderEnt": {
       "type": "object",
       "properties": {
         "order_info": {
           "$ref": "#/definitions/apiEntOrder",
           "title": "基本订单信息"
+        },
+        "insurance_info": {
+          "type": "string",
+          "title": "保险信息"
+        },
+        "city_package_info": {
+          "$ref": "#/definitions/apiCityPackageEnt",
+          "title": "城市套餐信息"
         }
       },
       "title": "城市套餐订单实体"
@@ -135,6 +314,46 @@
       "description": "- DEVICE_USE_TYPE_RESERVED: 保留\n - DEVICE_USE_TYPE_BATTERY: 租电/电池\n - DEVICE_USE_TYPE_ELECTRIC_VEHICLE: 租车/车辆\n - DEVICE_USE_TYPE_ELECTRIC_VEHICLE_BATTERY: 车电一体/车电一体",
       "title": "设备用途类型 | 对象使用类型"
     },
+    "apiDataTime": {
+      "type": "object",
+      "properties": {
+        "ctime": {
+          "type": "integer",
+          "format": "int32",
+          "title": "创建时间 时间戳 秒"
+        },
+        "utime": {
+          "type": "integer",
+          "format": "int32",
+          "title": "更新时间 时间戳 秒"
+        },
+        "dtime": {
+          "type": "integer",
+          "format": "int32",
+          "title": "删除时间 时间戳 秒"
+        }
+      },
+      "title": "数据的创建时间、更新时间、删除时间"
+    },
+    "apiDetailPackageMicroSoftReq": {
+      "type": "object",
+      "properties": {
+        "package_code": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "apiDetailPackageMicroSoftRes": {
+      "type": "object",
+      "properties": {
+        "data": {
+          "$ref": "#/definitions/apiCityPackageOrderEnt"
+        }
+      }
+    },
     "apiEntAdmin": {
       "type": "object",
       "properties": {
@@ -168,10 +387,91 @@
         "order_time": {
           "$ref": "#/definitions/apiOrderTime",
           "title": "订单时间"
+        },
+        "pay_method": {
+          "$ref": "#/definitions/apiPAY_METHOD",
+          "title": "支付方式"
+        },
+        "order_source": {
+          "$ref": "#/definitions/apiREQUEST_SOURCE",
+          "title": "订单来源"
         }
       },
       "title": "订单实体"
     },
+    "apiEntPackage": {
+      "type": "object",
+      "properties": {
+        "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": "上下架状态"
+        },
+        "code": {
+          "type": "string",
+          "title": "套餐code"
+        }
+      }
+    },
+    "apiEntTag": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "title": "标签名称"
+        },
+        "tag_code": {
+          "type": "string",
+          "title": "标签code"
+        },
+        "tag_type": {
+          "$ref": "#/definitions/apiDEVICE_USE_TYPE",
+          "title": "标签类型"
+        }
+      }
+    },
     "apiEntUser": {
       "type": "object",
       "properties": {
@@ -181,6 +481,17 @@
       },
       "title": "用户实体"
     },
+    "apiLISTED_STATUS": {
+      "type": "string",
+      "enum": [
+        "LISTED_STATUS_RESERVED",
+        "LISTED_STATUS_LISTED",
+        "LISTED_STATUS_UNLISTED"
+      ],
+      "default": "LISTED_STATUS_RESERVED",
+      "description": "- LISTED_STATUS_RESERVED: 保留\n - LISTED_STATUS_LISTED: 上架\n - LISTED_STATUS_UNLISTED: 下架",
+      "title": "上下架状态"
+    },
     "apiListPackageMicroSoftReq": {
       "type": "object",
       "properties": {
@@ -244,6 +555,27 @@
       },
       "title": "订单相关的时间"
     },
+    "apiPAY_METHOD": {
+      "type": "string",
+      "enum": [
+        "PAY_METHOD_RESERVED",
+        "PAY_METHOD_WECHAT"
+      ],
+      "default": "PAY_METHOD_RESERVED",
+      "description": "- PAY_METHOD_RESERVED: 保留\n - PAY_METHOD_WECHAT: 微信 jsapi",
+      "title": "支付方式"
+    },
+    "apiPackageType": {
+      "type": "string",
+      "enum": [
+        "PACKAGE_TYPE_RESERVED",
+        "PACKAGE_TYPE_DAY",
+        "PACKAGE_TYPE_NUM",
+        "PACKAGE_TYPE_DAY_NUM"
+      ],
+      "default": "PACKAGE_TYPE_RESERVED",
+      "title": "- PACKAGE_TYPE_RESERVED: 保留\n - PACKAGE_TYPE_DAY: 天卡\n - PACKAGE_TYPE_NUM: 次卡\n - PACKAGE_TYPE_DAY_NUM: 天次卡"
+    },
     "apiPageArg": {
       "type": "object",
       "properties": {
@@ -268,6 +600,27 @@
       },
       "title": "PageArg 分页参数"
     },
+    "apiPreBuyMicroSoftReq": {
+      "type": "object",
+      "properties": {
+        "data": {
+          "$ref": "#/definitions/apiCityPackageOrderEnt"
+        }
+      }
+    },
+    "apiPreBuyMicroSoftRes": {
+      "type": "object"
+    },
+    "apiREQUEST_SOURCE": {
+      "type": "string",
+      "enum": [
+        "REQUEST_SOURCE_RESERVED",
+        "REQUEST_SOURCE_WECHAT"
+      ],
+      "default": "REQUEST_SOURCE_RESERVED",
+      "description": "- REQUEST_SOURCE_RESERVED: 保留\n - REQUEST_SOURCE_WECHAT: 微信小程序",
+      "title": "请求来源"
+    },
     "apiShopArg": {
       "type": "object",
       "properties": {