@daocloud-proto/leopard 0.1.0-dev11 → 0.1.0-dev13

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@daocloud-proto/leopard",
-    "version":"0.1.0-dev11",
+    "version":"0.1.0-dev13",
     "description": "",
     "author": "",
     "license": "ISC"

package/v1alpha1/order.pb.ts

@@ -45,7 +45,6 @@ export type ListOrdersRequest = {
   instanceId?: string
   orderType?: OrderType
   productName?: string
-  payType?: BillingType
   orderStatus?: OrderStatus
   start?: string
   end?: string
@@ -53,7 +52,7 @@ export type ListOrdersRequest = {
   pageSize?: number
 }
 
-export type OrderItem = {
+export type Orders = {
   userName?: string
   orderId?: string
   createdAtTimestamp?: string
@@ -61,15 +60,12 @@ export type OrderItem = {
   productName?: string
   instances?: Instance[]
   orderStatus?: OrderStatus
-  billingType?: BillingType
-  unitPrice?: number
-  unit?: UnitType
   orderPrice?: string
   amountDue?: string
 }
 
 export type ListOrdersResponse = {
-  items?: OrderItem[]
+  items?: Orders[]
   pagination?: Pagination
 }
 
@@ -85,7 +81,7 @@ export type OrderInfo = {
 }
 
 export type Instance = {
-  name?: string
+  instanceName?: string
   id?: string
 }
 
@@ -120,15 +116,38 @@ export type GetProductsResponse = {
   products?: Product[]
 }
 
-export type CreateOrderRequest = {
-  username?: string
-  productId?: string
+export type OrderItem = {
+  productName?: string
   skuId?: string
   quantity?: number
-  instances?: string[]
+  instances?: Instance[]
+}
+
+export type CreateOrderRequest = {
+  username?: string
+  userId?: string
+  orderType?: OrderType
+  orderItems?: OrderItem[]
 }
 
 export type CreateOrderResponse = {
+  orderId?: string
+}
+
+export type GetInstanceOrderInfoByInstanceIDRequest = {
+  instanceId?: string
+}
+
+export type GetInstanceOrderInfoByInstanceIDResponse = {
+  instanceId?: string
+  instanceName?: string
+  username?: string
+  skuId?: string
+  productName?: string
+  billingType?: BillingType
+  meteringUnit?: UnitType
+  unitPrice?: number
+  quantity?: number
 }
 
 export class Order {
@@ -138,6 +157,9 @@ export class Order {
   static GetOrder(req: GetOrderRequest, initReq?: fm.InitReq): Promise<GetOrderResponse> {
     return fm.fetchReq<GetOrderRequest, GetOrderResponse>(`/apis/leopard.io/v1alpha1/orders/${req["id"]}?${fm.renderURLSearchParams(req, ["id"])}`, {...initReq, method: "GET"})
   }
+  static GetInstanceOrderInfoByInstanceID(req: GetInstanceOrderInfoByInstanceIDRequest, initReq?: fm.InitReq): Promise<GetInstanceOrderInfoByInstanceIDResponse> {
+    return fm.fetchReq<GetInstanceOrderInfoByInstanceIDRequest, GetInstanceOrderInfoByInstanceIDResponse>(`/apis/leopard.io/v1alpha1/orders/instances-info?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  }
   static GetProducts(req: GetProductsRequest, initReq?: fm.InitReq): Promise<GetProductsResponse> {
     return fm.fetchReq<GetProductsRequest, GetProductsResponse>(`/apis/leopard.io/v1alpha1/orders/products?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }

package/v1alpha1/product.pb.ts

@@ -17,8 +17,8 @@ export enum UnitType {
   COMPUTE_UNIT = "COMPUTE_UNIT",
 }
 
-export enum Currency {
-  CNY = "CNY",
+export enum QuantityUnit {
+  EMPTY = "EMPTY",
 }
 
 export type Pagination = {
@@ -31,7 +31,7 @@ export type FilterStringArr = {
   values?: string[]
 }
 
-export type ListProductSkusRequest = {
+export type ListProductSKUsRequest = {
   product?: string
   regionId?: string
   filter?: {[key: string]: FilterStringArr}
@@ -43,62 +43,59 @@ export type SkuItem = {
   id?: string
   saleable?: boolean
   billingType?: BillingType
-  unit?: UnitType
+  meteringUnit?: UnitType
+  quantityUnit?: QuantityUnit
   price?: number
   region?: string
-  specId?: string
+  specId?: number
   specName?: string
   specDetails?: {[key: string]: string}
 }
 
-export type ListProductSkusResponse = {
+export type ListProductSKUsResponse = {
   items?: SkuItem[]
   pagination?: Pagination
 }
 
-export type GetProductSkuRequest = {
+export type GetSKURequest = {
   id?: string
 }
 
-export type GetProductSkuResponse = {
+export type SpecField = {
+  specId?: number
+  key?: string
+  value?: string
+}
+
+export type GetSKUResponse = {
   id?: string
   saleable?: boolean
   billingType?: BillingType
-  unit?: UnitType
+  meteringUnit?: UnitType
+  quantityUnit?: QuantityUnit
   price?: number
   region?: string
-  specId?: string
+  specId?: number
   specName?: string
-  specDetails?: {[key: string]: string}
+  specFields?: SpecField[]
 }
 
-export type ListProductSpecDetailValuesRequest = {
-  regionId?: string
-  resourceKey?: string
-  product?: string
-}
-
-export type ProductSpecDetailValueItem = {
+export type GetSKUPriceRequest = {
   id?: string
-  name?: string
-}
-
-export type ProductSpecDetailValuesArr = {
-  items?: ProductSpecDetailValueItem[]
 }
 
-export type ListProductSpecDetailValuesResponse = {
-  valuesMap?: {[key: string]: ProductSpecDetailValuesArr}
+export type GetSKUPriceResponse = {
+  price?: string
 }
 
 export class Product {
-  static ListProductSkus(req: ListProductSkusRequest, initReq?: fm.InitReq): Promise<ListProductSkusResponse> {
-    return fm.fetchReq<ListProductSkusRequest, ListProductSkusResponse>(`/apis/leopard.io/v1alpha1/product/${req["product"]}/skus?${fm.renderURLSearchParams(req, ["product"])}`, {...initReq, method: "GET"})
+  static ListProductSKUs(req: ListProductSKUsRequest, initReq?: fm.InitReq): Promise<ListProductSKUsResponse> {
+    return fm.fetchReq<ListProductSKUsRequest, ListProductSKUsResponse>(`/apis/leopard.io/v1alpha1/products/skus`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
-  static GetProductSku(req: GetProductSkuRequest, initReq?: fm.InitReq): Promise<GetProductSkuResponse> {
-    return fm.fetchReq<GetProductSkuRequest, GetProductSkuResponse>(`/apis/leopard.io/v1alpha1/product/skus/${req["id"]}?${fm.renderURLSearchParams(req, ["id"])}`, {...initReq, method: "GET"})
+  static GetSKU(req: GetSKURequest, initReq?: fm.InitReq): Promise<GetSKUResponse> {
+    return fm.fetchReq<GetSKURequest, GetSKUResponse>(`/apis/leopard.io/v1alpha1/products/skus/${req["id"]}?${fm.renderURLSearchParams(req, ["id"])}`, {...initReq, method: "GET"})
   }
-  static ListProductSpecDetailValues(req: ListProductSpecDetailValuesRequest, initReq?: fm.InitReq): Promise<ListProductSpecDetailValuesResponse> {
-    return fm.fetchReq<ListProductSpecDetailValuesRequest, ListProductSpecDetailValuesResponse>(`/apis/leopard.io/v1alpha1/products/${req["product"]}/values?${fm.renderURLSearchParams(req, ["product"])}`, {...initReq, method: "GET"})
+  static GetSKUPrice(req: GetSKUPriceRequest, initReq?: fm.InitReq): Promise<GetSKUPriceResponse> {
+    return fm.fetchReq<GetSKUPriceRequest, GetSKUPriceResponse>(`/apis/leopard.io/v1alpha1/products/skus/${req["id"]}/price?${fm.renderURLSearchParams(req, ["id"])}`, {...initReq, method: "GET"})
   }
 }

package/v1alpha1/wallet.pb.ts

@@ -20,7 +20,7 @@ export type BalanceRequest = {
 }
 
 export type BalanceResponse = {
-  balance?: number
+  balance?: string
 }
 
 export type RechargeRequest = {
@@ -35,13 +35,6 @@ export type RechargeResponse = {
   redirectUrl?: string
 }
 
-export type AlipayNotifyRequest = {
-}
-
-export type AlipayNotifyResponse = {
-  message?: string
-}
-
 export class Wallet {
   static Balance(req: BalanceRequest, initReq?: fm.InitReq): Promise<BalanceResponse> {
     return fm.fetchReq<BalanceRequest, BalanceResponse>(`/apis/leopard.io/v1alpha1/wallet/balance?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
@@ -49,7 +42,4 @@ export class Wallet {
   static Recharge(req: RechargeRequest, initReq?: fm.InitReq): Promise<RechargeResponse> {
     return fm.fetchReq<RechargeRequest, RechargeResponse>(`/apis/leopard.io/v1alpha1/wallet/recharge`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
-  static AlipayNotify(req: AlipayNotifyRequest, initReq?: fm.InitReq): Promise<AlipayNotifyResponse> {
-    return fm.fetchReq<AlipayNotifyRequest, AlipayNotifyResponse>(`/apis/leopard.io/v1alpha1/wallet/alipay/notify`, {...initReq, method: "POST"})
-  }
 }