Merge pull request #199 from jdcloud-apigateway/master

publish jdcloud-sdk-go version 1.1.4

Author: jdcloud-apigateway

services/billing/ChangeLog.md

@@ -1,3 +1,15 @@
+2022-11-21 version 1.1.4
+1.对外接口返回增加可用区字段
+
+2022-08-18 version 1.1.3
+1.增加计费项月汇总账单对外接口
+
+2022-04-26 version: 1.1.1
+1.增加资源加入/移出回收站接口
+
+2021-11-08 version: 1.0.34
+1.解决go SDK返回值类型转换问题
+
 2021-07-12 version: 1.0.33
 1.更新官网计费文档，涉及查询账单资源汇总、明细接口
 

services/billing/apis/CalculateTotalPrice.go

@@ -28,7 +28,7 @@ type CalculateTotalPriceRequest struct {
     /*   */
     RegionId string `json:"regionId"`
 
-    /* 操作类型 1:创建 2:续费 3:升配 4:删除  */
+    /* 操作类型 1:新购 2:续费 3:变配  */
     Cmd int `json:"cmd"`
 
     /* 计算价格的订单 (Optional) */
@@ -61,7 +61,7 @@ type CalculateTotalPriceRequest struct {
 
 /*
  * param regionId:  (Required)
- * param cmd: 操作类型 1:创建 2:续费 3:升配 4:删除 (Required)
+ * param cmd: 操作类型 1:新购 2:续费 3:变配 (Required)
  * param packageCount: 批量购买时数量 (Required)
  *
  * @Deprecated, not compatible when mandatory parameters changed
@@ -87,7 +87,7 @@ func NewCalculateTotalPriceRequest(
 
 /*
  * param regionId:  (Required)
- * param cmd: 操作类型 1:创建 2:续费 3:升配 4:删除 (Required)
+ * param cmd: 操作类型 1:新购 2:续费 3:变配 (Required)
  * param orderList: 计算价格的订单 (Optional)
  * param operateTime: 操作时间(格式为：yyyy-MM-dd HH:mm:ss) (Optional)
  * param promotionInfo: 1:折扣（不需要传） 2:免费活动3:付费活动 4:推荐码 5:会员价 [{"promotionType":1,"activityCode":123},{"promotionType":2,"activityCode":}] (Optional)
@@ -150,57 +150,48 @@ func NewCalculateTotalPriceRequestWithoutParam() *CalculateTotalPriceRequest {
 func (r *CalculateTotalPriceRequest) SetRegionId(regionId string) {
     r.RegionId = regionId
 }
-
-/* param cmd: 操作类型 1:创建 2:续费 3:升配 4:删除(Required) */
+/* param cmd: 操作类型 1:新购 2:续费 3:变配(Required) */
 func (r *CalculateTotalPriceRequest) SetCmd(cmd int) {
     r.Cmd = cmd
 }
-
 /* param orderList: 计算价格的订单(Optional) */
 func (r *CalculateTotalPriceRequest) SetOrderList(orderList []billing.OrderPriceProtocol) {
     r.OrderList = orderList
 }
-
 /* param operateTime: 操作时间(格式为：yyyy-MM-dd HH:mm:ss)(Optional) */
 func (r *CalculateTotalPriceRequest) SetOperateTime(operateTime string) {
     r.OperateTime = &operateTime
 }
-
 /* param promotionInfo: 1:折扣（不需要传） 2:免费活动3:付费活动 4:推荐码 5:会员价 [{"promotionType":1,"activityCode":123},{"promotionType":2,"activityCode":}](Optional) */
 func (r *CalculateTotalPriceRequest) SetPromotionInfo(promotionInfo string) {
     r.PromotionInfo = &promotionInfo
 }
-
 /* param clientType: 客户端：1.PC端；2.移动端；(Optional) */
 func (r *CalculateTotalPriceRequest) SetClientType(clientType int) {
     r.ClientType = &clientType
 }
-
 /* param packageCount: 批量购买时数量(Required) */
 func (r *CalculateTotalPriceRequest) SetPackageCount(packageCount int) {
     r.PackageCount = packageCount
 }
-
 /* param processType: 临时升配时必传，3-临时升配(Optional) */
 func (r *CalculateTotalPriceRequest) SetProcessType(processType int) {
     r.ProcessType = &processType
 }
-
 /* param renewMode: 续费方式 0：正常续费  1：续费至统一到期日，续费时必传(Optional) */
 func (r *CalculateTotalPriceRequest) SetRenewMode(renewMode int) {
     r.RenewMode = &renewMode
 }
-
 /* param unifyExpireDay: 续费统一到期日(1-28)，续费时必传(Optional) */
 func (r *CalculateTotalPriceRequest) SetUnifyExpireDay(unifyExpireDay int) {
     r.UnifyExpireDay = &unifyExpireDay
 }
-
 /* param totalPriceRule: 计算总价规则 1：计算预付费资源总价（计费类型为包年包月、按次） ；不传计算所有资源总价(Optional) */
 func (r *CalculateTotalPriceRequest) SetTotalPriceRule(totalPriceRule int) {
     r.TotalPriceRule = &totalPriceRule
 }
 
+
 // GetRegionId returns path parameter 'regionId' if exist,
 // otherwise return empty string
 func (r CalculateTotalPriceRequest) GetRegionId() string {
@@ -218,9 +209,15 @@ type CalculateTotalPriceResult struct {
     TotalPriceScale4 int `json:"totalPriceScale4"`
     DiscountedTotalPrice int `json:"discountedTotalPrice"`
     TotalDiscount int `json:"totalDiscount"`
+    AfterFavorableTotalPrice float64 `json:"afterFavorableTotalPrice"`
+    EraseTotalPrice float64 `json:"eraseTotalPrice"`
     List []billing.OrderPriceDetail `json:"list"`
     TotalOriginalPrice int `json:"totalOriginalPrice"`
     FavorableInfos string `json:"favorableInfos"`
     Remark string `json:"remark"`
     TotalUnitPrice int `json:"totalUnitPrice"`
+    RefundTotalPrice float64 `json:"refundTotalPrice"`
+    CashRefundTotalPrice float64 `json:"cashRefundTotalPrice"`
+    BalanceRefundTotalPrice float64 `json:"balanceRefundTotalPrice"`
+    CouponRefundTotalPrice float64 `json:"couponRefundTotalPrice"`
 }

services/billing/apis/DescribeBillDetails.go

@@ -0,0 +1,212 @@
+// Copyright 2018 JDCLOUD.COM
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// NOTE: This class is auto generated by the jdcloud code generator program.
+
+package apis
+
+import (
+    "github.com/jdcloud-api/jdcloud-sdk-go/core"
+    billing "github.com/jdcloud-api/jdcloud-sdk-go/services/billing/models"
+)
+
+type DescribeBillDetailsRequest struct {
+
+    core.JDCloudRequest
+
+    /* Region ID  */
+    RegionId string `json:"regionId"`
+
+    /* 账期开始时间,不支持跨月查询。格式:yyyy-MM-dd HH:mm:ss  */
+    StartTime string `json:"startTime"`
+
+    /* 账期结束时间,不支持跨月查询。格式:yyyy-MM-dd HH:mm:ss  */
+    EndTime string `json:"endTime"`
+
+    /* 产品线代码 (Optional) */
+    AppCode *string `json:"appCode"`
+
+    /* 产品代码 (Optional) */
+    ServiceCode *string `json:"serviceCode"`
+
+    /* 计费类型 1、按配置 2、按用量 3、包年包月 4、按次 (Optional) */
+    BillingType *int `json:"billingType"`
+
+    /* 资源单id列表,最多支持传入500个 (Optional) */
+    ResourceIds []string `json:"resourceIds"`
+
+    /* 标签,JSON格式:[{"k1":"v1"},{"k1":"v2"},{"k2":""}]
+示例:
+选择的标签为, 部门:广告部、部门:物流部、项目
+则传值为:[{"部门":"广告部"},{"部门":"物流部"},{"项目":""}]
+ (Optional) */
+    Tags []interface{} `json:"tags"`
+
+    /* pageIndex 分页,默认从1开始 (Optional) */
+    PageIndex *int `json:"pageIndex"`
+
+    /* pageSize 每页查询数据条数,最多支持1000条 (Optional) */
+    PageSize *int `json:"pageSize"`
+}
+
+/*
+ * param regionId: Region ID (Required)
+ * param startTime: 账期开始时间,不支持跨月查询。格式:yyyy-MM-dd HH:mm:ss (Required)
+ * param endTime: 账期结束时间,不支持跨月查询。格式:yyyy-MM-dd HH:mm:ss (Required)
+ *
+ * @Deprecated, not compatible when mandatory parameters changed
+ */
+func NewDescribeBillDetailsRequest(
+    regionId string,
+    startTime string,
+    endTime string,
+) *DescribeBillDetailsRequest {
+
+	return &DescribeBillDetailsRequest{
+        JDCloudRequest: core.JDCloudRequest{
+			URL:     "/regions/{regionId}/describeBillDetails",
+			Method:  "POST",
+			Header:  nil,
+			Version: "v1",
+		},
+        RegionId: regionId,
+        StartTime: startTime,
+        EndTime: endTime,
+	}
+}
+
+/*
+ * param regionId: Region ID (Required)
+ * param startTime: 账期开始时间,不支持跨月查询。格式:yyyy-MM-dd HH:mm:ss (Required)
+ * param endTime: 账期结束时间,不支持跨月查询。格式:yyyy-MM-dd HH:mm:ss (Required)
+ * param appCode: 产品线代码 (Optional)
+ * param serviceCode: 产品代码 (Optional)
+ * param billingType: 计费类型 1、按配置 2、按用量 3、包年包月 4、按次 (Optional)
+ * param resourceIds: 资源单id列表,最多支持传入500个 (Optional)
+ * param tags: 标签,JSON格式:[{"k1":"v1"},{"k1":"v2"},{"k2":""}]
+示例:
+选择的标签为, 部门:广告部、部门:物流部、项目
+则传值为:[{"部门":"广告部"},{"部门":"物流部"},{"项目":""}]
+ (Optional)
+ * param pageIndex: pageIndex 分页,默认从1开始 (Optional)
+ * param pageSize: pageSize 每页查询数据条数,最多支持1000条 (Optional)
+ */
+func NewDescribeBillDetailsRequestWithAllParams(
+    regionId string,
+    startTime string,
+    endTime string,
+    appCode *string,
+    serviceCode *string,
+    billingType *int,
+    resourceIds []string,
+    tags []interface{},
+    pageIndex *int,
+    pageSize *int,
+) *DescribeBillDetailsRequest {
+
+    return &DescribeBillDetailsRequest{
+        JDCloudRequest: core.JDCloudRequest{
+            URL:     "/regions/{regionId}/describeBillDetails",
+            Method:  "POST",
+            Header:  nil,
+            Version: "v1",
+        },
+        RegionId: regionId,
+        StartTime: startTime,
+        EndTime: endTime,
+        AppCode: appCode,
+        ServiceCode: serviceCode,
+        BillingType: billingType,
+        ResourceIds: resourceIds,
+        Tags: tags,
+        PageIndex: pageIndex,
+        PageSize: pageSize,
+    }
+}
+
+/* This constructor has better compatible ability when API parameters changed */
+func NewDescribeBillDetailsRequestWithoutParam() *DescribeBillDetailsRequest {
+
+    return &DescribeBillDetailsRequest{
+            JDCloudRequest: core.JDCloudRequest{
+            URL:     "/regions/{regionId}/describeBillDetails",
+            Method:  "POST",
+            Header:  nil,
+            Version: "v1",
+        },
+    }
+}
+
+/* param regionId: Region ID(Required) */
+func (r *DescribeBillDetailsRequest) SetRegionId(regionId string) {
+    r.RegionId = regionId
+}
+/* param startTime: 账期开始时间,不支持跨月查询。格式:yyyy-MM-dd HH:mm:ss(Required) */
+func (r *DescribeBillDetailsRequest) SetStartTime(startTime string) {
+    r.StartTime = startTime
+}
+/* param endTime: 账期结束时间,不支持跨月查询。格式:yyyy-MM-dd HH:mm:ss(Required) */
+func (r *DescribeBillDetailsRequest) SetEndTime(endTime string) {
+    r.EndTime = endTime
+}
+/* param appCode: 产品线代码(Optional) */
+func (r *DescribeBillDetailsRequest) SetAppCode(appCode string) {
+    r.AppCode = &appCode
+}
+/* param serviceCode: 产品代码(Optional) */
+func (r *DescribeBillDetailsRequest) SetServiceCode(serviceCode string) {
+    r.ServiceCode = &serviceCode
+}
+/* param billingType: 计费类型 1、按配置 2、按用量 3、包年包月 4、按次(Optional) */
+func (r *DescribeBillDetailsRequest) SetBillingType(billingType int) {
+    r.BillingType = &billingType
+}
+/* param resourceIds: 资源单id列表,最多支持传入500个(Optional) */
+func (r *DescribeBillDetailsRequest) SetResourceIds(resourceIds []string) {
+    r.ResourceIds = resourceIds
+}
+/* param tags: 标签,JSON格式:[{"k1":"v1"},{"k1":"v2"},{"k2":""}]
+示例:
+选择的标签为, 部门:广告部、部门:物流部、项目
+则传值为:[{"部门":"广告部"},{"部门":"物流部"},{"项目":""}]
+(Optional) */
+func (r *DescribeBillDetailsRequest) SetTags(tags []interface{}) {
+    r.Tags = tags
+}
+/* param pageIndex: pageIndex 分页,默认从1开始(Optional) */
+func (r *DescribeBillDetailsRequest) SetPageIndex(pageIndex int) {
+    r.PageIndex = &pageIndex
+}
+/* param pageSize: pageSize 每页查询数据条数,最多支持1000条(Optional) */
+func (r *DescribeBillDetailsRequest) SetPageSize(pageSize int) {
+    r.PageSize = &pageSize
+}
+
+
+// GetRegionId returns path parameter 'regionId' if exist,
+// otherwise return empty string
+func (r DescribeBillDetailsRequest) GetRegionId() string {
+    return r.RegionId
+}
+
+type DescribeBillDetailsResponse struct {
+    RequestID string `json:"requestId"`
+    Error core.ErrorResponse `json:"error"`
+    Result DescribeBillDetailsResult `json:"result"`
+}
+
+type DescribeBillDetailsResult struct {
+    Pagination billing.Pagination `json:"pagination"`
+    Result []billing.BillSummaryV2 `json:"result"`
+}