Merge pull request #1751 from ioito/hotfix/qx-bill-summary

fix: add qcloud and aliyun bill qummary cli

Author: ioito

pkg/multicloud/aliyun/business.go

@@ -124,3 +124,65 @@ func (self *SAliyunClient) SubscribeBillToOSS(bucket string) error {
 	log.Debugf("%s", body)
 	return nil
 }
+
+type SBillOverview struct {
+	BillingCycle string     `json:"BillingCycle"`
+	AccountID    string     `json:"AccountID"`
+	AccountName  string     `json:"AccountName"`
+	Items        SBillItems `json:"Items"`
+	TotalAmount  float64    `json:"TotalAmount"`
+}
+
+type SBillItems struct {
+	Item []SBillItem `json:"Item"`
+}
+
+type SBillItem struct {
+	DeductedByCoupons     float64 `json:"DeductedByCoupons"`
+	RoundDownDiscount     float64 `json:"RoundDownDiscount"`
+	ProductName           string  `json:"ProductName"`
+	ProductDetail         string  `json:"ProductDetail"`
+	ProductCode           string  `json:"ProductCode"`
+	BillAccountID         string  `json:"BillAccountID"`
+	ProductType           string  `json:"ProductType"`
+	DeductedByCashCoupons float64 `json:"DeductedByCashCoupons"`
+	OutstandingAmount     float64 `json:"OutstandingAmount"`
+	BizType               string  `json:"BizType"`
+	PaymentAmount         float64 `json:"PaymentAmount"`
+	PipCode               string  `json:"PipCode"`
+	DeductedByPrepaidCard float64 `json:"DeductedByPrepaidCard"`
+	InvoiceDiscount       float64 `json:"InvoiceDiscount"`
+	Item                  string  `json:"Item"`
+	SubscriptionType      string  `json:"SubscriptionType"`
+	PretaxGrossAmount     float64 `json:"PretaxGrossAmount"`
+	PretaxAmount          float64 `json:"PretaxAmount"`
+	OwnerID               string  `json:"OwnerID"`
+	Currency              string  `json:"Currency"`
+	CommodityCode         string  `json:"CommodityCode"`
+	BillAccountName       string  `json:"BillAccountName"`
+	AdjustAmount          float64 `json:"AdjustAmount"`
+	CashAmount            float64 `json:"CashAmount"`
+}
+
+func (self *SAliyunClient) QueryBillOverview(billCycle, ownerId string) (*SBillOverview, error) {
+	params := make(map[string]string)
+	params["BillingCycle"] = billCycle
+	if len(ownerId) > 0 {
+		params["BillOwnerId"] = ownerId
+	}
+	body, err := self.businessRequest("QueryBillOverview", params)
+	if err != nil {
+		return nil, errors.Wrap(err, "QueryBillOverview")
+	}
+	overview := SBillOverview{}
+	err = body.Unmarshal(&overview, "Data")
+	if err != nil {
+		return nil, errors.Wrap(err, "body.Unmarshal")
+	}
+	totalAmount := 0.0
+	for _, item := range overview.Items.Item {
+		totalAmount += item.PretaxAmount
+	}
+	overview.TotalAmount = totalAmount
+	return &overview, nil
+}

pkg/multicloud/aliyun/shell/business.go

@@ -59,4 +59,17 @@ func init() {
 		return nil
 	})
 
+	type AliyunQueryBillOverviewOptions struct {
+		MONTH   string
+		OwnerId string `help:"Owner ID"`
+	}
+	shellutils.R(&AliyunQueryBillOverviewOptions{}, "query-bill-overview", "Query bill overview", func(cli *aliyun.SRegion, args *AliyunQueryBillOverviewOptions) error {
+		result, err := cli.GetClient().QueryBillOverview(args.MONTH, args.OwnerId)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 }

pkg/multicloud/qcloud/qcloud.go

@@ -1079,6 +1079,46 @@ func (client *SQcloudClient) QueryAccountBalance() (*SAccountBalance, error) {
 	return balance, nil
 }
 
+type SBillSummary struct {
+	Ready         int                `json:"Ready"`
+	SummaryDetail []SBillSummaryItem `json:"SummaryDetail"`
+	TotalAmount   float64            `json:"TotalAmount"`
+}
+
+type SBillSummaryItem struct {
+	Business           []jsonutils.JSONObject `json:"Business"`
+	CashPayAmount      float64                `json:"CashPayAmount"`
+	GroupKey           string                 `json:"GroupKey"`
+	GroupValue         string                 `json:"GroupValue"`
+	IncentivePayAmount float64                `json:"IncentivePayAmount"`
+	RealTotalCost      float64                `json:"RealTotalCost"`
+	TotalCost          float64                `json:"TotalCost"`
+	TransferPayAmount  float64                `json:"TransferPayAmount"`
+	VoucherPayAmount   float64                `json:"VoucherPayAmount"`
+}
+
+func (client *SQcloudClient) DescribeBillSummary(month string, uin string) (*SBillSummary, error) {
+	params := make(map[string]string)
+	params["Month"] = month
+	params["GroupType"] = "business"
+	if len(uin) > 0 {
+		params["Uin"] = uin
+	}
+	body, err := client.billingRequest("DescribeBillSummary", params)
+	if err != nil {
+		return nil, errors.Wrapf(err, "DescribeBillSummary")
+	}
+	summary := SBillSummary{}
+	err = body.Unmarshal(&summary)
+	if err != nil {
+		return nil, errors.Wrapf(err, "body.Unmarshal")
+	}
+	for _, item := range summary.SummaryDetail {
+		summary.TotalAmount += item.RealTotalCost
+	}
+	return &summary, nil
+}
+
 func (client *SQcloudClient) GetIProjects() ([]cloudprovider.ICloudProject, error) {
 	projects := []SProject{}
 	for {

pkg/multicloud/qcloud/shell/business.go

@@ -0,0 +1,36 @@
+// Copyright 2019 Yunion
+//
+// 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.
+
+package shell
+
+import (
+	"yunion.io/x/pkg/util/shellutils"
+
+	"yunion.io/x/cloudmux/pkg/multicloud/qcloud"
+)
+
+func init() {
+	type QcloudBillSummaryOptions struct {
+		MONTH string `help:"Billing month, e.g. 2024-02"`
+		Uin   string `help:"Root account UIN, optional"`
+	}
+	shellutils.R(&QcloudBillSummaryOptions{}, "bill-summary", "Query bill summary", func(cli *qcloud.SRegion, args *QcloudBillSummaryOptions) error {
+		result, err := cli.GetClient().DescribeBillSummary(args.MONTH, args.Uin)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+}