Skip to content

Commit f1059ed

Browse files
author
BitsAdmin
committed
Merge branch 'billing-Java-2022-01-01-online-1377-2025_07_21_15_26_23' into 'integration_2025-07-24_1019324691714'
feat: [development task] billing-1377-Java (1482732) See merge request iaasng/volcengine-java-sdk!582
2 parents 2d0db9f + e93c015 commit f1059ed

8 files changed

+4570
-108
lines changed

volcengine-java-sdk-billing/src/main/java/com/volcengine/billing/model/ListForListAmortizedCostBillDailyOutput.java

Lines changed: 1059 additions & 1 deletion
Large diffs are not rendered by default.

volcengine-java-sdk-billing/src/main/java/com/volcengine/billing/model/ListForListAmortizedCostBillDetailOutput.java

Lines changed: 369 additions & 1 deletion
Large diffs are not rendered by default.

volcengine-java-sdk-billing/src/main/java/com/volcengine/billing/model/ListForListAmortizedCostBillMonthlyOutput.java

Lines changed: 1780 additions & 101 deletions
Large diffs are not rendered by default.

volcengine-java-sdk-billing/src/main/java/com/volcengine/billing/model/ListForListBillDetailOutput.java

Lines changed: 208 additions & 1 deletion
Large diffs are not rendered by default.

volcengine-java-sdk-billing/src/main/java/com/volcengine/billing/model/ListForListBillOutput.java

Lines changed: 415 additions & 1 deletion
Large diffs are not rendered by default.

volcengine-java-sdk-billing/src/main/java/com/volcengine/billing/model/ListForListBillOverviewByCategoryOutput.java

Lines changed: 116 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ public class ListForListBillOverviewByCategoryOutput {
5454
@SerializedName("Currency")
5555
private String currency = null;
5656

57+
@SerializedName("CurrencySettlement")
58+
private String currencySettlement = null;
59+
5760
@SerializedName("DiscountBillAmount")
5861
private String discountBillAmount = null;
5962

@@ -87,6 +90,9 @@ public class ListForListBillOverviewByCategoryOutput {
8790
@SerializedName("PosttaxAmount")
8891
private String posttaxAmount = null;
8992

93+
@SerializedName("PreTaxPayableAmount")
94+
private String preTaxPayableAmount = null;
95+
9096
@SerializedName("PretaxAmount")
9197
private String pretaxAmount = null;
9298

@@ -96,6 +102,9 @@ public class ListForListBillOverviewByCategoryOutput {
96102
@SerializedName("RealValue")
97103
private String realValue = null;
98104

105+
@SerializedName("SavingPlanOriginalAmount")
106+
private String savingPlanOriginalAmount = null;
107+
99108
@SerializedName("SellerCustomerName")
100109
private String sellerCustomerName = null;
101110

@@ -105,9 +114,15 @@ public class ListForListBillOverviewByCategoryOutput {
105114
@SerializedName("SellerUserName")
106115
private String sellerUserName = null;
107116

117+
@SerializedName("SettlePayableAmount")
118+
private String settlePayableAmount = null;
119+
108120
@SerializedName("SettlePosttaxAmount")
109121
private String settlePosttaxAmount = null;
110122

123+
@SerializedName("SettlePreTaxPayableAmount")
124+
private String settlePreTaxPayableAmount = null;
125+
111126
@SerializedName("SettlePretaxAmount")
112127
private String settlePretaxAmount = null;
113128

@@ -279,6 +294,24 @@ public void setCurrency(String currency) {
279294
this.currency = currency;
280295
}
281296

297+
public ListForListBillOverviewByCategoryOutput currencySettlement(String currencySettlement) {
298+
this.currencySettlement = currencySettlement;
299+
return this;
300+
}
301+
302+
/**
303+
* Get currencySettlement
304+
* @return currencySettlement
305+
**/
306+
@Schema(description = "")
307+
public String getCurrencySettlement() {
308+
return currencySettlement;
309+
}
310+
311+
public void setCurrencySettlement(String currencySettlement) {
312+
this.currencySettlement = currencySettlement;
313+
}
314+
282315
public ListForListBillOverviewByCategoryOutput discountBillAmount(String discountBillAmount) {
283316
this.discountBillAmount = discountBillAmount;
284317
return this;
@@ -477,6 +510,24 @@ public void setPosttaxAmount(String posttaxAmount) {
477510
this.posttaxAmount = posttaxAmount;
478511
}
479512

513+
public ListForListBillOverviewByCategoryOutput preTaxPayableAmount(String preTaxPayableAmount) {
514+
this.preTaxPayableAmount = preTaxPayableAmount;
515+
return this;
516+
}
517+
518+
/**
519+
* Get preTaxPayableAmount
520+
* @return preTaxPayableAmount
521+
**/
522+
@Schema(description = "")
523+
public String getPreTaxPayableAmount() {
524+
return preTaxPayableAmount;
525+
}
526+
527+
public void setPreTaxPayableAmount(String preTaxPayableAmount) {
528+
this.preTaxPayableAmount = preTaxPayableAmount;
529+
}
530+
480531
public ListForListBillOverviewByCategoryOutput pretaxAmount(String pretaxAmount) {
481532
this.pretaxAmount = pretaxAmount;
482533
return this;
@@ -531,6 +582,24 @@ public void setRealValue(String realValue) {
531582
this.realValue = realValue;
532583
}
533584

585+
public ListForListBillOverviewByCategoryOutput savingPlanOriginalAmount(String savingPlanOriginalAmount) {
586+
this.savingPlanOriginalAmount = savingPlanOriginalAmount;
587+
return this;
588+
}
589+
590+
/**
591+
* Get savingPlanOriginalAmount
592+
* @return savingPlanOriginalAmount
593+
**/
594+
@Schema(description = "")
595+
public String getSavingPlanOriginalAmount() {
596+
return savingPlanOriginalAmount;
597+
}
598+
599+
public void setSavingPlanOriginalAmount(String savingPlanOriginalAmount) {
600+
this.savingPlanOriginalAmount = savingPlanOriginalAmount;
601+
}
602+
534603
public ListForListBillOverviewByCategoryOutput sellerCustomerName(String sellerCustomerName) {
535604
this.sellerCustomerName = sellerCustomerName;
536605
return this;
@@ -585,6 +654,24 @@ public void setSellerUserName(String sellerUserName) {
585654
this.sellerUserName = sellerUserName;
586655
}
587656

657+
public ListForListBillOverviewByCategoryOutput settlePayableAmount(String settlePayableAmount) {
658+
this.settlePayableAmount = settlePayableAmount;
659+
return this;
660+
}
661+
662+
/**
663+
* Get settlePayableAmount
664+
* @return settlePayableAmount
665+
**/
666+
@Schema(description = "")
667+
public String getSettlePayableAmount() {
668+
return settlePayableAmount;
669+
}
670+
671+
public void setSettlePayableAmount(String settlePayableAmount) {
672+
this.settlePayableAmount = settlePayableAmount;
673+
}
674+
588675
public ListForListBillOverviewByCategoryOutput settlePosttaxAmount(String settlePosttaxAmount) {
589676
this.settlePosttaxAmount = settlePosttaxAmount;
590677
return this;
@@ -603,6 +690,24 @@ public void setSettlePosttaxAmount(String settlePosttaxAmount) {
603690
this.settlePosttaxAmount = settlePosttaxAmount;
604691
}
605692

693+
public ListForListBillOverviewByCategoryOutput settlePreTaxPayableAmount(String settlePreTaxPayableAmount) {
694+
this.settlePreTaxPayableAmount = settlePreTaxPayableAmount;
695+
return this;
696+
}
697+
698+
/**
699+
* Get settlePreTaxPayableAmount
700+
* @return settlePreTaxPayableAmount
701+
**/
702+
@Schema(description = "")
703+
public String getSettlePreTaxPayableAmount() {
704+
return settlePreTaxPayableAmount;
705+
}
706+
707+
public void setSettlePreTaxPayableAmount(String settlePreTaxPayableAmount) {
708+
this.settlePreTaxPayableAmount = settlePreTaxPayableAmount;
709+
}
710+
606711
public ListForListBillOverviewByCategoryOutput settlePretaxAmount(String settlePretaxAmount) {
607712
this.settlePretaxAmount = settlePretaxAmount;
608713
return this;
@@ -783,6 +888,7 @@ public boolean equals(java.lang.Object o) {
783888
Objects.equals(this.couponAmount, listForListBillOverviewByCategoryOutput.couponAmount) &&
784889
Objects.equals(this.creditCarriedAmount, listForListBillOverviewByCategoryOutput.creditCarriedAmount) &&
785890
Objects.equals(this.currency, listForListBillOverviewByCategoryOutput.currency) &&
891+
Objects.equals(this.currencySettlement, listForListBillOverviewByCategoryOutput.currencySettlement) &&
786892
Objects.equals(this.discountBillAmount, listForListBillOverviewByCategoryOutput.discountBillAmount) &&
787893
Objects.equals(this.originalBillAmount, listForListBillOverviewByCategoryOutput.originalBillAmount) &&
788894
Objects.equals(this.ownerCustomerName, listForListBillOverviewByCategoryOutput.ownerCustomerName) &&
@@ -794,13 +900,17 @@ public boolean equals(java.lang.Object o) {
794900
Objects.equals(this.payerID, listForListBillOverviewByCategoryOutput.payerID) &&
795901
Objects.equals(this.payerUserName, listForListBillOverviewByCategoryOutput.payerUserName) &&
796902
Objects.equals(this.posttaxAmount, listForListBillOverviewByCategoryOutput.posttaxAmount) &&
903+
Objects.equals(this.preTaxPayableAmount, listForListBillOverviewByCategoryOutput.preTaxPayableAmount) &&
797904
Objects.equals(this.pretaxAmount, listForListBillOverviewByCategoryOutput.pretaxAmount) &&
798905
Objects.equals(this.pretaxRealValue, listForListBillOverviewByCategoryOutput.pretaxRealValue) &&
799906
Objects.equals(this.realValue, listForListBillOverviewByCategoryOutput.realValue) &&
907+
Objects.equals(this.savingPlanOriginalAmount, listForListBillOverviewByCategoryOutput.savingPlanOriginalAmount) &&
800908
Objects.equals(this.sellerCustomerName, listForListBillOverviewByCategoryOutput.sellerCustomerName) &&
801909
Objects.equals(this.sellerID, listForListBillOverviewByCategoryOutput.sellerID) &&
802910
Objects.equals(this.sellerUserName, listForListBillOverviewByCategoryOutput.sellerUserName) &&
911+
Objects.equals(this.settlePayableAmount, listForListBillOverviewByCategoryOutput.settlePayableAmount) &&
803912
Objects.equals(this.settlePosttaxAmount, listForListBillOverviewByCategoryOutput.settlePosttaxAmount) &&
913+
Objects.equals(this.settlePreTaxPayableAmount, listForListBillOverviewByCategoryOutput.settlePreTaxPayableAmount) &&
804914
Objects.equals(this.settlePretaxAmount, listForListBillOverviewByCategoryOutput.settlePretaxAmount) &&
805915
Objects.equals(this.settlePretaxRealValue, listForListBillOverviewByCategoryOutput.settlePretaxRealValue) &&
806916
Objects.equals(this.settleRealValue, listForListBillOverviewByCategoryOutput.settleRealValue) &&
@@ -814,7 +924,7 @@ public boolean equals(java.lang.Object o) {
814924

815925
@Override
816926
public int hashCode() {
817-
return Objects.hash(billCategoryParent, billPeriod, businessMode, countryArea, countryRegion, couponAmount, creditCarriedAmount, currency, discountBillAmount, originalBillAmount, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, posttaxAmount, pretaxAmount, pretaxRealValue, realValue, sellerCustomerName, sellerID, sellerUserName, settlePosttaxAmount, settlePretaxAmount, settlePretaxRealValue, settleRealValue, settleTax, settlementType, subjectName, subjectNo, tax, unpaidAmount);
927+
return Objects.hash(billCategoryParent, billPeriod, businessMode, countryArea, countryRegion, couponAmount, creditCarriedAmount, currency, currencySettlement, discountBillAmount, originalBillAmount, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, posttaxAmount, preTaxPayableAmount, pretaxAmount, pretaxRealValue, realValue, savingPlanOriginalAmount, sellerCustomerName, sellerID, sellerUserName, settlePayableAmount, settlePosttaxAmount, settlePreTaxPayableAmount, settlePretaxAmount, settlePretaxRealValue, settleRealValue, settleTax, settlementType, subjectName, subjectNo, tax, unpaidAmount);
818928
}
819929

820930

@@ -831,6 +941,7 @@ public String toString() {
831941
sb.append(" couponAmount: ").append(toIndentedString(couponAmount)).append("\n");
832942
sb.append(" creditCarriedAmount: ").append(toIndentedString(creditCarriedAmount)).append("\n");
833943
sb.append(" currency: ").append(toIndentedString(currency)).append("\n");
944+
sb.append(" currencySettlement: ").append(toIndentedString(currencySettlement)).append("\n");
834945
sb.append(" discountBillAmount: ").append(toIndentedString(discountBillAmount)).append("\n");
835946
sb.append(" originalBillAmount: ").append(toIndentedString(originalBillAmount)).append("\n");
836947
sb.append(" ownerCustomerName: ").append(toIndentedString(ownerCustomerName)).append("\n");
@@ -842,13 +953,17 @@ public String toString() {
842953
sb.append(" payerID: ").append(toIndentedString(payerID)).append("\n");
843954
sb.append(" payerUserName: ").append(toIndentedString(payerUserName)).append("\n");
844955
sb.append(" posttaxAmount: ").append(toIndentedString(posttaxAmount)).append("\n");
956+
sb.append(" preTaxPayableAmount: ").append(toIndentedString(preTaxPayableAmount)).append("\n");
845957
sb.append(" pretaxAmount: ").append(toIndentedString(pretaxAmount)).append("\n");
846958
sb.append(" pretaxRealValue: ").append(toIndentedString(pretaxRealValue)).append("\n");
847959
sb.append(" realValue: ").append(toIndentedString(realValue)).append("\n");
960+
sb.append(" savingPlanOriginalAmount: ").append(toIndentedString(savingPlanOriginalAmount)).append("\n");
848961
sb.append(" sellerCustomerName: ").append(toIndentedString(sellerCustomerName)).append("\n");
849962
sb.append(" sellerID: ").append(toIndentedString(sellerID)).append("\n");
850963
sb.append(" sellerUserName: ").append(toIndentedString(sellerUserName)).append("\n");
964+
sb.append(" settlePayableAmount: ").append(toIndentedString(settlePayableAmount)).append("\n");
851965
sb.append(" settlePosttaxAmount: ").append(toIndentedString(settlePosttaxAmount)).append("\n");
966+
sb.append(" settlePreTaxPayableAmount: ").append(toIndentedString(settlePreTaxPayableAmount)).append("\n");
852967
sb.append(" settlePretaxAmount: ").append(toIndentedString(settlePretaxAmount)).append("\n");
853968
sb.append(" settlePretaxRealValue: ").append(toIndentedString(settlePretaxRealValue)).append("\n");
854969
sb.append(" settleRealValue: ").append(toIndentedString(settleRealValue)).append("\n");

0 commit comments

Comments
 (0)